zold 0.20.1 → 0.20.2

data/lib/zold/head.rb

@@ -40,26 +40,27 @@ module Zold
     def fetch
       raise "Wallet file '#{@file}' is absent" unless File.exist?(@file)
       lines = IO.read(@file).split(/\n/)
+      # lines = ['', '', '0123456701234567', '']
       raise "Not enough lines in #{@file}, just #{lines.count}" if lines.count < 4
       lines.take(4)
     end
+  end
 
-    # Cached head.
-    # Author:: Yegor Bugayenko (yegor256@gmail.com)
-    # Copyright:: Copyright (c) 2018 Yegor Bugayenko
-    # License:: MIT
-    class Cached
-      def initialize(txns)
-        @txns = txns
-      end
+  # Cached head.
+  # Author:: Yegor Bugayenko (yegor256@gmail.com)
+  # Copyright:: Copyright (c) 2018 Yegor Bugayenko
+  # License:: MIT
+  class CachedHead
+    def initialize(head)
+      @head = head
+    end
 
-      def flush
-        @fetch = nil
-      end
+    def flush
+      @fetch = nil
+    end
 
-      def fetch
-        @fetch ||= @txns.fetch
-      end
+    def fetch
+      @fetch ||= @head.fetch
     end
   end
 end

data/lib/zold/hungry_wallets.rb

@@ -58,7 +58,7 @@ module Zold
           @mutex.synchronize do
             unless @queue.include?(id)
               @queue << id
-              @log.debug("Hungry queue got #{id}, at the pos no.#{@queue.size}")
+              @log.debug("Hungry queue got #{id}, at the pos no.#{@queue.size - 1}")
             end
           end
         end
@@ -76,7 +76,7 @@ module Zold
       end
       begin
         Pull.new(wallets: @wallets, remotes: @remotes, copies: @copies, log: @log).run(
-          ['pull', id.to_s, "--network=#{@network}"]
+          ['pull', id.to_s, "--network=#{@network}", '--tolerate-edges', '--tolerate-quorum=1']
         )
       rescue Fetch::EdgesOnly => e
         @log.error("Can't hungry-pull #{id}: #{e.message}")

data/lib/zold/id.rb

@@ -31,14 +31,10 @@ module Zold
     PTN = Regexp.new('^[0-9a-fA-F]{16}$')
     private_constant :PTN
 
-    def initialize(id = nil)
-      if id.nil?
-        @id = rand(2**32..2**64 - 1)
-      else
-        raise "Invalid wallet ID type: #{id.class.name}" unless id.is_a?(String)
-        raise "Invalid wallet ID: #{id}" unless id =~ PTN
-        @id = Integer("0x#{id}", 16)
-      end
+    def initialize(id = format('%016x', rand(2**32..2**64 - 1)))
+      raise "Invalid wallet ID type: #{id.class.name}" unless id.is_a?(String)
+      raise "Invalid wallet ID: #{id}" unless PTN.match?(id)
+      @id = Integer("0x#{id}", 16)
     end
 
     # The ID of the root wallet.

data/lib/zold/metronome.rb

@@ -23,6 +23,7 @@
 require 'backtrace'
 require_relative 'log'
 require_relative 'age'
+require_relative 'endless'
 require_relative 'verbose_thread'
 require_relative 'thread_pool'
 
@@ -58,10 +59,10 @@ module Zold
     def start
       @routines.each_with_index do |r, idx|
         @threads.add do
-          Thread.current.name = "#{r.class.name}-#{idx}"
           step = 0
-          loop do
+          Endless.new("#{r.class.name}-#{idx}", log: @log).run do
             Thread.current.thread_variable_set(:start, Time.now)
+            step += 1
             begin
               r.exec(step)
               @log.debug("Routine #{r.class.name} ##{step} done \
@@ -70,9 +71,8 @@ in #{Age.new(Thread.current.thread_variable_get(:start))}")
               @failures[r.class.name] = Time.now.utc.iso8601 + "\n" + Backtrace.new(e).to_s
               @log.error("Routine #{r.class.name} ##{step} failed \
 in #{Age.new(Thread.current.thread_variable_get(:start))}")
-              @log.error(Backtrace.new(e).to_s)
+              raise e
             end
-            step += 1
             sleep(1)
           end
         end

data/lib/zold/node/async_entrance.rb

@@ -60,10 +60,14 @@ module Zold
     def start
       raise 'Block must be given to start()' unless block_given?
       FileUtils.mkdir_p(@dir)
-      DirItems.new(@dir).fetch.select { |f| f =~ /^[0-9a-f]{16}-/ }.each do |f|
+      DirItems.new(@dir).fetch.each do |f|
         file = File.join(@dir, f)
-        id = f.split('-')[0]
-        @queue << { id: Id.new(id), file: file }
+        if /^[0-9a-f]{16}-/.match?(f)
+          id = f.split('-')[0]
+          @queue << { id: Id.new(id), file: file }
+        else
+          File.delete(file)
+        end
       end
       @log.info("#{@queue.size} wallets pre-loaded into async_entrace from #{@dir}") unless @queue.size.zero?
       @entrance.start do

data/lib/zold/node/farm.rb

@@ -53,7 +53,7 @@ module Zold
     #
     # <tt>cache</tt> is the file where the farm will keep all the scores it
     # manages to find. If the file is absent, it will be created, together with
-    # the necesary parent directories.
+    # the necessary parent directories.
     #
     # <tt>lifetime</tt> is the amount of seconds for a score to live in the farm, by default
     # it's the entire day, since the Score expires in 24 hours; can be decreased for the

data/lib/zold/node/front.rb

@@ -48,7 +48,7 @@ require_relative 'soft_error'
 module Zold
   # Web front
   class Front < Sinatra::Base
-    # The minimum score required in order to recongnize a requestor
+    # The minimum score required in order to recognize a requester
     # as a valuable node and add it to the list of remotes.
     MIN_SCORE = 4
 
@@ -208,17 +208,19 @@ from #{request.ip} in #{Age.new(@start, limit: 1)}")
         cpus: settings.zache.get(:cpus) do
           Concurrent.processor_count
         end,
-        memory: settings.zache.get(:memory, lifetime: 5 * 60) do
+        memory: settings.zache.get(:memory, lifetime: settings.opts['no-cache'] ? 0 : 60) do
           mem = GetProcessMem.new.bytes.to_i
           if mem > settings.opts['oom-limit'] * 1024 * 1024 &&
             !settings.opts['skip-oom'] && !settings.opts['never-reboot']
-            settings.log.error("We are too big in memory (#{Size.new(mem)}), quitting; use --skip-oom to never quit")
+            settings.log.error("We are too big in memory (#{Size.new(mem)}), quitting; \
+use --skip-oom to never quit or --memory-dump to print the entire memory usage summary on exit; \
+this is not a normal behavior, you may want to report a bug to our GitHub repository")
             Front.stop!
           end
           mem
         end,
         platform: RUBY_PLATFORM,
-        load: settings.zache.get(:load, lifetime: 5 * 60) do
+        load: settings.zache.get(:load, lifetime: settings.opts['no-cache'] ? 0 : 60) do
           require 'usagewatch_ext'
           Object.const_defined?('Usagewatch') ? Usagewatch.uw_load.to_f : 0.0
         end,
@@ -248,7 +250,7 @@ from #{request.ip} in #{Age.new(@start, limit: 1)}")
           digest: wallet.digest,
           copies: Copies.new(File.join(settings.copies, wallet.id)).all.count,
           balance: wallet.balance.to_i,
-          body: File.new(wallet.path).read
+          body: IO.read(wallet.path)
         )
       end
     end
@@ -460,6 +462,7 @@ time to stop; use --skip-oom to never quit")
     end
 
     def total_wallets
+      return 256 unless settings.opts['no-cache']
       settings.zache.get(:wallets, lifetime: settings.opts['no-cache'] ? 0 : 60) do
         settings.wallets.count
       end

data/lib/zold/node/sync_entrance.rb

@@ -46,6 +46,10 @@ module Zold
 
     def start
       raise 'Block must be given to start()' unless block_given?
+      if File.exist?(@dir)
+        FileUtils.rm_rf(@dir)
+        @log.info("Directory #{@dir} deleted")
+      end
       @entrance.start do
         yield(self)
       end

data/lib/zold/remotes.rb

@@ -39,6 +39,61 @@ require_relative 'node/farm'
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 module Zold
+  # One remote.
+  class RemoteNode
+    def initialize(host:, port:, score:, idx:, master:, network: 'test', log: Log::NULL)
+      @host = host
+      @port = port
+      @score = score
+      @idx = idx
+      @master = master
+      @network = network
+      @log = log
+    end
+
+    def http(path = '/')
+      Http.new(uri: "http://#{@host}:#{@port}#{path}", score: @score, network: @network)
+    end
+
+    def master?
+      @master
+    end
+
+    def to_s
+      "#{@host}:#{@port}/#{@idx}"
+    end
+
+    def assert_code(code, response)
+      msg = response.status_line.strip
+      return if response.status.to_i == code
+      if response.headers && response.headers['X-Zold-Error']
+        raise "Error ##{response.status} \"#{response.headers['X-Zold-Error']}\"
+            at #{response.headers['X-Zold-Path']}"
+      end
+      raise "Unexpected HTTP code #{response.status}, instead of #{code}" if msg.empty?
+      raise "#{msg} (HTTP code #{response.status}, instead of #{code})"
+    end
+
+    def assert_valid_score(score)
+      raise "Invalid score #{score.reduced(4)}" unless score.valid?
+      raise "Expired score (#{Age.new(score.time)}) #{score.reduced(4)}" if score.expired?
+    end
+
+    def assert_score_ownership(score)
+      raise "Masqueraded host #{@host} as #{score.host}: #{score.reduced(4)}" if @host != score.host
+      raise "Masqueraded port #{@port} as #{score.port}: #{score.reduced(4)}" if @port != score.port
+    end
+
+    def assert_score_strength(score)
+      return if score.strength >= Score::STRENGTH
+      raise "Score #{score.strength} is too weak (<#{Score::STRENGTH}): #{score.reduced(4)}"
+    end
+
+    def assert_score_value(score, min)
+      raise "Score #{score.value} is too small (<#{min}): #{score.reduced(4)}" if score.value < min
+    end
+  end
+
   # All remotes
   class Remotes
     # The default TCP port all nodes are supposed to use.
@@ -73,60 +128,6 @@ module Zold
       end
     end
 
-    # One remote.
-    class Remote
-      def initialize(host:, port:, score:, idx:, network: 'test', log: Log::NULL)
-        @host = host
-        @port = port
-        @score = score
-        @idx = idx
-        @network = network
-        @log = log
-      end
-
-      def http(path = '/')
-        Http.new(uri: "http://#{@host}:#{@port}#{path}", score: @score, network: @network)
-      end
-
-      def master?
-        !MASTERS.find { |r| r[0] == @host && r[1].to_i == @port }.nil?
-      end
-
-      def to_s
-        "#{@host}:#{@port}/#{@idx}"
-      end
-
-      def assert_code(code, response)
-        msg = response.status_line.strip
-        return if response.status.to_i == code
-        if response.headers && response.headers['X-Zold-Error']
-          raise "Error ##{response.status} \"#{response.headers['X-Zold-Error']}\"
-            at #{response.headers['X-Zold-Path']}"
-        end
-        raise "Unexpected HTTP code #{response.status}, instead of #{code}" if msg.empty?
-        raise "#{msg} (HTTP code #{response.status}, instead of #{code})"
-      end
-
-      def assert_valid_score(score)
-        raise "Invalid score #{score.reduced(4)}" unless score.valid?
-        raise "Expired score (#{Age.new(score.time)}) #{score.reduced(4)}" if score.expired?
-      end
-
-      def assert_score_ownership(score)
-        raise "Masqueraded host #{@host} as #{score.host}: #{score.reduced(4)}" if @host != score.host
-        raise "Masqueraded port #{@port} as #{score.port}: #{score.reduced(4)}" if @port != score.port
-      end
-
-      def assert_score_strength(score)
-        return if score.strength >= Score::STRENGTH
-        raise "Score #{score.strength} is too weak (<#{Score::STRENGTH}): #{score.reduced(4)}"
-      end
-
-      def assert_score_value(score, min)
-        raise "Score #{score.value} is too small (<#{min}): #{score.reduced(4)}" if score.value < min
-      end
-    end
-
     def initialize(file:, network: 'test', timeout: 60)
       @file = file
       @network = network
@@ -197,11 +198,12 @@ module Zold
         start = Time.now
         best = farm.best[0]
         begin
-          yield Remotes::Remote.new(
+          yield RemoteNode.new(
             host: r[:host],
             port: r[:port],
             score: best.nil? ? Score::ZERO : best,
             idx: idx,
+            master: master?(r[:host], r[:port]),
             log: log,
             network: @network
           )

data/lib/zold/tax.rb

@@ -60,8 +60,8 @@ module Zold
     # When score strengths were updated. The numbers here indicate the
     # strengths we accepted before these dates.
     MILESTONES = {
-      Time.parse('30-11-2018') => 6,
-      Time.parse('09-12-2018') => 7
+      Txn.parse_time('2018-11-30T00:00:00Z') => 6,
+      Txn.parse_time('2018-12-09T00:00:00Z') => 7
     }.freeze
     private_constant :MILESTONES
 

data/lib/zold/thread_pool.rb

@@ -41,25 +41,29 @@ module Zold
     # Run this code in many threads
     def run(threads, set = (0..threads - 1).to_a)
       raise "Number of threads #{threads} has to be positive" unless threads.positive?
-      idx = Concurrent::AtomicFixnum.new
-      mutex = Mutex.new
       list = set.dup
       total = [threads, set.count].min
-      latch = Concurrent::CountDownLatch.new(total)
-      total.times do |i|
-        add do
-          Thread.current.name = "#{@title}-#{i}"
-          loop do
-            r = mutex.synchronize { list.pop }
-            break if r.nil?
-            yield(r, idx.increment - 1)
+      if total == 1
+        list.each_with_index { |r, i| yield(r, i) }
+      elsif total.positive?
+        idx = Concurrent::AtomicFixnum.new
+        mutex = Mutex.new
+        latch = Concurrent::CountDownLatch.new(total)
+        total.times do |i|
+          add do
+            Thread.current.name = "#{@title}-#{i}"
+            loop do
+              r = mutex.synchronize { list.pop }
+              break if r.nil?
+              yield(r, idx.increment - 1)
+            end
+          ensure
+            latch.count_down
           end
-        ensure
-          latch.count_down
         end
+        latch.wait
+        kill
       end
-      latch.wait
-      kill
     end
 
     # Add a new thread

data/lib/zold/tree_wallets.rb

@@ -67,7 +67,7 @@ module Zold
     end
 
     def count
-      `find . -name "*.z" | wc -l`.strip.to_i
+      `find #{@dir} -name "*.z" | wc -l`.strip.to_i
     end
   end
 end

data/lib/zold/txn.rb

@@ -42,6 +42,14 @@ module Zold
     RE_PREFIX = '[a-zA-Z0-9]+'
     private_constant :RE_PREFIX
 
+    # To validate the prefix
+    REGEX_PREFIX = Regexp.new("^#{RE_PREFIX}$")
+    private_constant :REGEX_PREFIX
+
+    # To validate details
+    REGEX_DETAILS = Regexp.new("^#{RE_DETAILS}$")
+    private_constant :REGEX_DETAILS
+
     attr_reader :id, :date, :amount, :prefix, :bnf, :details, :sign
     attr_writer :sign, :amount, :bnf
     def initialize(id, date, amount, prefix, bnf, details)
@@ -62,12 +70,12 @@ module Zold
       raise 'Prefix can\'t be NIL' if prefix.nil?
       raise "Prefix is too short: \"#{prefix}\"" if prefix.length < 8
       raise "Prefix is too long: \"#{prefix}\"" if prefix.length > 32
-      raise "Prefix is wrong: \"#{prefix}\" (#{RE_PREFIX})" unless prefix =~ Regexp.new("^#{RE_PREFIX}$")
+      raise "Prefix is wrong: \"#{prefix}\" (#{RE_PREFIX})" unless REGEX_PREFIX.match?(prefix)
       @prefix = prefix
       raise 'Details can\'t be NIL' if details.nil?
       raise 'Details can\'t be empty' if details.empty?
       raise "Details are too long: \"#{details}\"" if details.length > 512
-      raise "Wrong details \"#{details}\" (#{RE_DETAILS})" unless details =~ Regexp.new("^#{RE_DETAILS}$")
+      raise "Wrong details \"#{details}\" (#{RE_DETAILS})" unless REGEX_DETAILS.match?(details)
       @details = details
     end
 
@@ -149,7 +157,7 @@ module Zold
       raise "Invalid line ##{idx}: #{line.inspect} #{regex}" unless parts
       txn = Txn.new(
         Hexnum.parse(parts[:id]).to_i,
-        Time.parse(parts[:date]),
+        parse_time(parts[:date]),
         Amount.new(zents: Hexnum.parse(parts[:amount]).to_i),
         parts[:prefix],
         Id.new(parts[:bnf]),
@@ -158,5 +166,26 @@ module Zold
       txn.sign = parts[:sign]
       txn
     end
+
+    ISO8601 = Regexp.new(
+      '^' + [
+        '(?<year>\d{4})',
+        '-(?<month>\d{2})',
+        '-(?<day>\d{2})',
+        'T(?<hours>\d{2})',
+        ':(?<minutes>\d{2})',
+        ':(?<seconds>\d{2})Z'
+      ].join
+    )
+    private_constant :ISO8601
+
+    def self.parse_time(iso)
+      parts = ISO8601.match(iso)
+      raise "Invalid ISO 8601 date \"#{iso}\"" if parts.nil?
+      Time.gm(
+        parts[:year].to_i, parts[:month].to_i, parts[:day].to_i,
+        parts[:hours].to_i, parts[:minutes].to_i, parts[:seconds].to_i
+      )
+    end
   end
 end