zold 0.13.34 → 0.13.35

data/lib/zold/node/farm.rb

@@ -62,6 +62,7 @@ module Zold
         threads: @threads.map do |t|
           "#{t.name}/#{t.status}/#{t.alive? ? 'A' : 'D'}"
         end.join(', '),
+        cleanup: @cleanup.status,
         pipeline: @pipeline.size,
         best: best.map(&:to_mnemo).join(', ')
       }
@@ -81,9 +82,10 @@ module Zold
           end
         end
       end
-      @threads << Thread.new do
+      alive = true
+      @cleanup = Thread.new do
         Thread.current.name = 'cleanup'
-        loop do
+        while alive
           sleep(60) unless strength == 1 # which will only happen in tests
           VerboseThread.new(@log).run do
             cleanup(host, port, strength, threads)
@@ -93,21 +95,25 @@ module Zold
       @log.info("Farm started with #{@threads.count} threads at #{host}:#{port}, strength is #{strength}")
       return unless block_given?
       begin
-        yield
+        yield(self)
       ensure
-        stop
-      end
-    end
-
-    def stop
-      @log.info("Terminating the farm 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")
+        @log.info("Terminating the farm with #{@threads.count} threads...")
+        start = Time.now
+        alive = false
+        if strength == 1
+          @cleanup.join
+          @log.info("Cleanup thread finished in #{(Time.now - start).round(2)}s")
+        else
+          @cleanup.exit
+          @log.info("Cleanup thread killed in #{(Time.now - start).round(2)}s")
+        end
+        @threads.each do |t|
+          tstart = Time.now
+          t.exit
+          @log.info("Thread #{t.name} terminated in #{(Time.now - tstart).round(2)}s")
+        end
+        @log.info("Farm stopped in #{(Time.now - start).round(2)}s")
       end
-      @log.info("Farm stopped in #{(Time.now - start).round(2)}s")
     end
 
     private

data/lib/zold/node/front.rb

@@ -43,7 +43,7 @@ module Zold
     configure do
       set :bind, '0.0.0.0'
       set :suppress_messages, true
-      set :dump_errors, false
+      set :dump_errors, true
       set :start, Time.now
       set :lock, false
       set :show_exceptions, false
@@ -58,6 +58,7 @@ module Zold
       set :farm, nil? # to be injected at node.rb
       set :metronome, nil? # to be injected at node.rb
       set :entrance, nil? # to be injected at node.rb
+      set :network, nil? # to be injected at node.rb
       set :wallets, nil? # to be injected at node.rb
       set :remotes, nil? # to be injected at node.rb
       set :copies, nil? # to be injected at node.rb
@@ -65,22 +66,26 @@ module Zold
     use Rack::Deflater
 
     before do
-      name = "HTTP-#{Http::SCORE_HEADER}".upcase.tr('-', '_')
-      header = request.env[name]
-      return unless header
-      if settings.remotes.all.empty?
-        settings.log.debug("#{request.url}: we are in standalone mode, won't update remotes")
+      check_header(Http::NETWORK_HEADER) do |header|
+        if header != settings.network
+          raise "Network name mismatch, you are in '#{header}', we are in '#{settings.network}'"
+        end
       end
-      s = Score.parse_text(header)
-      error(400, 'The score is invalid') unless s.valid?
-      error(400, 'The score is weak') if s.strength < Score::STRENGTH && !settings.ignore_score_weakness
-      if s.value > 3
-        require_relative '../commands/remote'
-        Remote.new(remotes: settings.remotes, log: settings.log).run(
-          ['remote', 'add', s.host, s.port.to_s, '--force']
-        )
-      else
-        settings.log.debug("#{request.url}: the score is too weak: #{s}")
+      check_header(Http::SCORE_HEADER) do |header|
+        if settings.remotes.all.empty?
+          settings.log.debug("#{request.url}: we are in standalone mode, won't update remotes")
+        end
+        s = Score.parse_text(header)
+        error(400, 'The score is invalid') unless s.valid?
+        error(400, 'The score is weak') if s.strength < Score::STRENGTH && !settings.ignore_score_weakness
+        if s.value > 3
+          require_relative '../commands/remote'
+          Remote.new(remotes: settings.remotes, log: settings.log).run(
+            ['remote', 'add', s.host, s.port.to_s, '--force']
+          )
+        else
+          settings.log.debug("#{request.url}: the score is too weak: #{s}")
+        end
       end
     end
 
@@ -121,6 +126,7 @@ module Zold
       content_type 'application/json'
       JSON.pretty_generate(
         version: settings.version,
+        network: settings.network,
         score: score.to_h,
         pid: Process.pid,
         cpus: Concurrent.processor_count,
@@ -181,7 +187,7 @@ module Zold
         )
       end
       settings.log.info("Wallet #{id} is new: #{before.length}b != #{after.length}b")
-      settings.entrance.push(id, after, sync: !params[:sync].nil?)
+      settings.entrance.push(id, after)
       JSON.pretty_generate(
         version: settings.version,
         score: score.to_h
@@ -228,6 +234,13 @@ module Zold
 
     private
 
+    def check_header(name)
+      name = "HTTP-#{name}".upcase.tr('-', '_')
+      header = request.env[name]
+      return unless header
+      yield header
+    end
+
     def score
       best = settings.farm.best
       raise 'Score is empty, there is something wrong with the Farm!' if best.empty?

data/lib/zold/node/safe_entrance.rb

@@ -0,0 +1,78 @@
+# 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 'tempfile'
+require_relative 'emission'
+require_relative '../log'
+require_relative '../remotes'
+require_relative '../copies'
+require_relative '../tax'
+require_relative '../commands/merge'
+require_relative '../commands/fetch'
+require_relative '../commands/push'
+
+# The entrance thav validate the incoming wallet first.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2018 Yegor Bugayenko
+# License:: MIT
+module Zold
+  # The safe entrance
+  class SafeEntrance
+    def initialize(entrance, network: 'test')
+      raise 'Entrance can\'t be nil' if entrance.nil?
+      @entrance = entrance
+      raise 'Network can\'t be nil' if network.nil?
+      @network = network
+    end
+
+    def start
+      @entrance.start { yield(self) }
+    end
+
+    def to_json
+      @entrance.to_json
+    end
+
+    # Returns a list of modifed wallets (as Zold::Id)
+    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?
+      Tempfile.open do |f|
+        File.write(f.path, body)
+        wallet = Wallet.new(f)
+        unless wallet.network == @network
+          raise "The network name mismatch, the wallet is in '#{wallet.network}', we are in '#{@network}'"
+        end
+        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
+        @entrance.push(id, body)
+      end
+    end
+  end
+end

data/lib/zold/node/spread_entrance.rb

@@ -0,0 +1,105 @@
+# 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 'tempfile'
+require_relative 'emission'
+require_relative '../log'
+require_relative '../remotes'
+require_relative '../copies'
+require_relative '../tax'
+require_relative '../commands/merge'
+require_relative '../commands/fetch'
+require_relative '../commands/push'
+require_relative '../commands/clean'
+
+# The entrance that spreads what's been modified.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2018 Yegor Bugayenko
+# License:: MIT
+module Zold
+  # The entrance
+  class SpreadEntrance
+    def initialize(entrance, wallets, remotes, address, log: Log::Quiet.new, ignore_score_weakeness: false)
+      raise 'Entrance can\'t be nil' if entrance.nil?
+      @entrance = entrance
+      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' unless remotes.is_a?(Remotes)
+      @remotes = remotes
+      raise 'Address can\'t be nil' if address.nil?
+      @address = address
+      raise 'Log can\'t be nil' if log.nil?
+      @log = log
+      @ignore_score_weakeness = ignore_score_weakeness
+    end
+
+    def to_json
+      @entrance.to_json.merge(
+        'modified': @modified.size,
+        'push': @push.status
+      )
+    end
+
+    def start
+      @entrance.start do
+        @seen = Set.new
+        @modified = Queue.new
+        @push = Thread.start do
+          Thread.current.abort_on_exception = true
+          Thread.current.name = 'push'
+          VerboseThread.new(@log).run do
+            loop do
+              id = @modified.pop
+              if @remotes.all.empty?
+                @log.info("There are no remotes, won\'t spread #{id}")
+              else
+                Push.new(wallets: @wallets, remotes: @remotes, log: @log).run(
+                  ['push', "--ignore-node=#{@address}", id.to_s] +
+                  (@ignore_score_weakeness ? ['--ignore-score-weakness'] : [])
+                )
+              end
+              @seen.delete(id)
+            end
+          end
+        end
+        begin
+          yield(self)
+        ensure
+          @log.info('Waiting for spread entrance to finish...')
+          @modified.clear
+          @push.exit
+          @log.info('Spread entrance finished, thread killed')
+        end
+      end
+    end
+
+    def push(id, body)
+      @entrance.push(id, body).each do |m|
+        next if @seen.include?(m)
+        @seen << m
+        @modified.push(m)
+        @log.debug("Push scheduled for #{m}, queue size is #{@modified.size}")
+      end
+    end
+  end
+end

data/lib/zold/patch.rb

@@ -66,14 +66,15 @@ module Zold
         next if @txns.find { |t| t == txn }
         if txn.amount.negative?
           if txn.id <= max
-            @log.error("Transaction ID is less than max #{max}: #{txn.to_text}")
+            @log.error("Transaction ID is not greater than max ID #{max}: #{txn.to_text}")
             next
           end
-          if @txns.find { |t| t.id == txn.id }
-            @log.error("Transaction ##{txn.id} already exists: #{txn.to_text}")
+          dup = @txns.find { |t| t.id == txn.id }
+          if dup
+            @log.error("An attempt to overwrite #{dup.to_text} with this: #{txn.to_text}")
             next
           end
-          if !@txns.empty? && @txns.map(&:amount).inject(&:+) < txn.amount
+          if @txns.map(&:amount).map(&:to_i).inject(&:+).to_i < txn.amount.to_i * -1 && !wallet.root?
             @log.error("Transaction ##{txn.id} attempts to make the balance negative: #{txn.to_text}")
             next
           end
@@ -92,7 +93,8 @@ module Zold
             next
           end
           unless payer.has?(txn.id, wallet.id)
-            @log.error("Paying wallet #{wallet.id} doesn't have transaction ##{txn.id}: #{txn.to_text}")
+            @log.error("Paying wallet #{txn.bnf} doesn't have transaction ##{txn.id} \
+among #{payer.txns.count} transactions: #{txn.to_text}")
             next
           end
         end

data/lib/zold/remotes.rb

@@ -20,6 +20,7 @@
 
 require 'csv'
 require 'uri'
+require 'time'
 require 'fileutils'
 require_relative 'backtrace'
 require_relative 'node/farm'
@@ -39,7 +40,11 @@ module Zold
     TOLERANCE = 8
 
     # Empty, for standalone mode
-    class Empty
+    class Empty < Remotes
+      def initialize
+        # Nothing here
+      end
+
       def all
         []
       end
@@ -52,7 +57,7 @@ module Zold
     # One remote.
     class Remote
       attr_reader :host, :port
-      def initialize(host, port, score, idx, log: Log::Quiet.new)
+      def initialize(host, port, score, idx, log: Log::Quiet.new, network: 'test')
         @host = host
         raise 'Post must be Integer' unless port.is_a?(Integer)
         @port = port
@@ -60,11 +65,13 @@ module Zold
         @score = score
         raise 'Idx must be of type Integer' unless idx.is_a?(Integer)
         @idx = idx
+        raise 'Network can\'t be nil' if network.nil?
+        @network = network
         @log = log
       end
 
       def http(path = '/')
-        Http.new("http://#{@host}:#{@port}#{path}", @score)
+        Http.new("http://#{@host}:#{@port}#{path}", @score, network: @network)
       end
 
       def to_s
@@ -90,7 +97,7 @@ module Zold
       end
 
       def assert_score_strength(score)
-        raise "Score is too weak #{score.strength}: #{score}" if score.strength < Score::STRENGTH
+        raise "Score #{score.strength} is too weak (<#{Score::STRENGTH}): #{score}" if score.strength < Score::STRENGTH
       end
 
       def assert_score_value(score, min)
@@ -98,8 +105,11 @@ module Zold
       end
     end
 
-    def initialize(file)
+    def initialize(file, network: 'test')
+      raise 'File can\'t be nil' if file.nil?
       @file = file
+      raise 'Network can\'t be nil' if network.nil?
+      @network = network
     end
 
     def all
@@ -163,15 +173,17 @@ module Zold
       best = farm.best[0]
       require_relative 'score'
       score = best.nil? ? Score::ZERO : best
+      start = Time.now
       idx = 0
       all.each do |r|
         begin
-          yield Remotes::Remote.new(r[:host], r[:port], score, idx, log: log)
+          yield Remotes::Remote.new(r[:host], r[:port], score, idx, log: log, network: @network)
           idx += 1
         rescue StandardError => e
           error(r[:host], r[:port])
           errors = errors(r[:host], r[:port])
-          log.info("#{Rainbow("#{r[:host]}:#{r[:port]}").red}: #{e.message}; errors=#{errors}")
+          log.info("#{Rainbow("#{r[:host]}:#{r[:port]}").red}: #{e.message} \
+in #{(Time.now - start).round}s; errors=#{errors}")
           log.debug(Backtrace.new(e).to_s)
           remove(r[:host], r[:port]) if errors > Remotes::TOLERANCE
         end

data/lib/zold/txn.rb

@@ -68,7 +68,9 @@ module Zold
     end
 
     def ==(other)
-      id == other.id && bnf == other.bnf
+      id == other.id && date == other.date && amount == other.amount &&
+        prefix == other.prefix && bnf == other.bnf &&
+        details == other.details && sign == other.sign
     end
 
     def to_s