zold 0.14.35 → 0.14.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d432935c1080d120f3317e2ab42b61deec92b968
-  data.tar.gz: e744e35fd2eeb18f6dc6249018c353d794888cf5
+  metadata.gz: e0ac9a7fc3634c563abae9dce0f68ca709d46490
+  data.tar.gz: 59bb7653c11021d3d46c6cab7124480c9db2a103
 SHA512:
-  metadata.gz: 02f6761e39313a18d0739ab02f3a0fdb467c12acc2efcc14a1e18815ef4f2afa2453b77ef3c2ab1d4ccc6cfa8c6648390527007595d19f662ac54a9474d08867
-  data.tar.gz: ab94bcf9c33d7721fa47886e96883dfa1b841478dc4b01944422de03c4b27462f6904689f44691d5b7ea49ec418ae1916e45d6f18f1b41322a3b6e8d9d363187
+  metadata.gz: cc4d99b314585fc077c82779463f09505d71f787a560087a2d55f3ab17184580df1aa0f12de8e0afb49914a0f2bff5d5064f343d579a9fe0d289562cacf94efe
+  data.tar.gz: 1995bae0601aa6cd84b5de1f3eeb58b27914f2d4d2935a503fa5226c88d12eaa659a6a76bcac58dae8b7103dac813ba90be1e66597490af4bf899e8f77ead092

data/bin/zold

@@ -113,6 +113,7 @@ Available options:"
       default: Zold::Wallet::MAIN_NETWORK
     o.bool '-h', '--help', 'Show these instructions'
     o.bool '--trace', 'Show full stack trace in case of a problem'
+    o.bool '--skip-upgrades', 'Don\'t upgrade the storage', default: false
     o.bool '--ignore-global-config', 'Don\'t read options from the ~/.zold file'
     o.on '--no-colors', 'Disable colors in the ouput' do
       Rainbow.enabled = false
@@ -146,17 +147,18 @@ Available options:"
 
   zoldata = File.expand_path(File.join(Dir.pwd, '.zoldata'))
 
-  Zold::Upgrades.new(Zold::VersionFile.new(File.join(zoldata, 'version')), 'upgrades').run
-
-  # @todo #384:30min This is a workaround, move this code into Upgrades, somehow.
-  #  We should find a way to run these arbitrary scripts and pass arguments
-  #  to them. Each of them may need its own set of arguments.
-  require_relative '../upgrades/2'
-  Zold::UpgradeTo2.new(Dir.pwd, log).exec
-  require_relative '../upgrades/protocol_up'
-  Zold::ProtocolUp.new(Dir.pwd, log).exec
-  require_relative '../upgrades/rename_foreign_wallets'
-  Zold::RenameForeignWallets.new(Dir.pwd, opts['network'], log).exec
+  unless opts['skip-upgrades']
+    Zold::Upgrades.new(Zold::VersionFile.new(File.join(zoldata, 'version')), 'upgrades').run
+    # @todo #384:30min This is a workaround, move this code into Upgrades, somehow.
+    #  We should find a way to run these arbitrary scripts and pass arguments
+    #  to them. Each of them may need its own set of arguments.
+    require_relative '../upgrades/2'
+    Zold::UpgradeTo2.new(Dir.pwd, log).exec
+    require_relative '../upgrades/protocol_up'
+    Zold::ProtocolUp.new(Dir.pwd, log).exec
+    require_relative '../upgrades/rename_foreign_wallets'
+    Zold::RenameForeignWallets.new(Dir.pwd, opts['network'], log).exec
+  end
 
   wallets = Zold::SyncWallets.new(Zold::Wallets.new('.'), File.join(zoldata, 'locks'), log: log)
   remotes = Zold::Remotes.new(file: File.join(zoldata, 'remotes'), network: opts['network'])

data/lib/zold/commands/invoice.rb

@@ -48,6 +48,9 @@ Available options:"
         o.integer '--length',
           'The length of the invoice prefix (default: 8)',
           default: 8
+        o.string '--network',
+          'The name of the network we work in',
+          default: 'test'
         o.bool '--help', 'Print instructions'
       end
       mine = Args.new(opts, @log).take || return

data/lib/zold/commands/next.rb

@@ -51,7 +51,7 @@ Available options:"
     private
 
     def calculate(opts)
-      @log.info(Score.parse(opts.arguments[1]).next.to_s)
+      @log.info(Score.parse(opts.arguments.drop_while { |a| a.start_with?('--') }[1]).next.to_s)
     end
   end
 end

data/lib/zold/commands/node.rb

@@ -76,8 +76,8 @@ module Zold
           "The strength of the score (default: #{Score::STRENGTH})",
           default: Score::STRENGTH
         o.integer '--threads',
-          'How many threads to use for scores finding (default: 4)',
-          default: 4
+          'How many threads to use for scores finding (default: 2)',
+          default: 2
         o.bool '--dump-errors',
           'Make HTTP front-end errors visible in the log (false by default)',
           default: false
@@ -302,14 +302,17 @@ module Zold
 
     def metronome(farm, opts)
       metronome = Metronome.new(@log)
-      return metronome if opts['no-metronome']
+      if opts['no-metronome']
+        @log.info('Metronome hasn\'t been started because of --no-metronome')
+        return metronome
+      end
       require_relative 'routines/spread'
       metronome.add(Routines::Spread.new(opts, @wallets, @remotes, log: @log))
       unless opts['standalone']
         require_relative 'routines/reconnect'
         metronome.add(Routines::Reconnect.new(opts, @remotes, farm, network: opts['network'], log: @log))
       end
-      @log.info('Metronome created')
+      @log.info('Metronome started (use --no-metronome to disable it)')
       metronome
     end
 

data/lib/zold/http.rb

@@ -66,12 +66,8 @@ module Zold
     #  that is already taken care of in another issue. I am leaving a todo
     #  to check that rubocop doesn't complain anymore, otherwise find another
     #  solution
-    attribute :uri, (Types::Class.constructor do |value|
-      value.is_a?(URI) ? value : URI(value)
-    end)
-    attribute :score, (Types::Class.constructor do |value|
-      value.nil? ? Score::ZERO : value
-    end)
+    attribute :uri, (Types::Class.constructor { |v| v.is_a?(URI) ? v : URI(v) })
+    attribute :score, (Types::Class.constructor { |v| v.nil? ? Score::ZERO : v })
     attribute :network, Types::Strict::String.optional.default('test')
 
     def get

data/lib/zold/node/async_entrance.rb

@@ -69,7 +69,7 @@ module Zold
         )
         AsyncEntrance::THREADS.times do |t|
           @pool.post do
-            Thread.current.name = "async-#{t}"
+            Thread.current.name = "async-e##{t}"
             loop do
               VerboseThread.new(@log).run(true) { take }
               break if @pool.shuttingdown?

data/lib/zold/node/farm.rb

@@ -42,7 +42,7 @@ module Zold
       end
     end
 
-    def initialize(invoice, cache, log: Log::Quiet.new)
+    def initialize(invoice, cache = File.join(Dir.pwd, 'farm'), log: Log::Quiet.new)
       @log = log
       @cache = cache
       @invoice = invoice
@@ -92,8 +92,15 @@ module Zold
       @cleanup = Thread.new do
         Thread.current.abort_on_exception = true
         Thread.current.name = 'cleanup'
-        while @alive
-          sleep(60) unless strength == 1 # which will only happen in tests
+        loop do
+          a = [0..600].take_while do
+            sleep 0.1
+            @alive
+          end
+          unless a.count == 600
+            @log.info("It's time to stop the cleanup thread...")
+            break
+          end
           VerboseThread.new(@log).run do
             cleanup(host, port, strength, threads)
           end
@@ -106,25 +113,31 @@ module Zold
       ensure
         @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.join(0.1)
-          @log.info("Thread #{t.name} finished in #{(Time.now - tstart).round(2)}s")
-        end
+        finish(@cleanup)
+        @threads.each { |t| finish(t) }
         @log.info("Farm stopped in #{(Time.now - start).round(2)}s")
       end
     end
 
     private
 
+    def finish(thread)
+      start = Time.now
+      @alive = false
+      @log.info("Attempting to terminate the thread \"#{thread.name}\"...")
+      loop do
+        delay = (Time.now - start).round(2)
+        if thread.join(0.1)
+          @log.info("Thread \"#{thread.name}\" finished in #{delay}s")
+          break
+        end
+        if delay > 10
+          thread.exit
+          @log.error("Thread \"#{thread.name}\" forcefully terminated after #{delay}s")
+        end
+      end
+    end
+
     def cleanup(host, port, strength, threads)
       scores = load
       before = scores.map(&:value).max.to_i
@@ -141,14 +154,25 @@ module Zold
     end
 
     def cycle(host, port, strength, threads)
-      s = @pipeline.pop
+      s = []
+      loop do
+        return unless @alive
+        begin
+          s << @pipeline.pop(true)
+        rescue ThreadError => _
+          sleep 0.25
+        end
+        s.compact!
+        break unless s.empty?
+      end
+      s = s[0]
       return unless s.valid?
       return unless s.host == host
       return unless s.port == port
       return unless s.strength >= strength
       Thread.current.name = s.to_mnemo
       bin = File.expand_path(File.join(File.dirname(__FILE__), '../../../bin/zold'))
-      Open3.popen2e("ruby #{bin} next \"#{s}\"") do |stdin, stdout, thr|
+      Open3.popen2e("ruby #{bin} --skip-upgrades next \"#{s}\"") do |stdin, stdout, thr|
         @log.debug("Score counting started in process ##{thr.pid}")
         begin
           stdin.close
@@ -157,18 +181,21 @@ module Zold
             begin
               buffer << stdout.read_nonblock(1024)
             rescue IO::WaitReadable => e
-              @log.debug("Still waiting for data from the score provider: #{e.message}")
+              @log.debug("Still waiting for the data from the process ##{thr.pid}: #{e.message}")
             end
-            if buffer.end_with?("\n")
+            if buffer.end_with?("\n") && thr.value.to_i.zero?
               score = Score.parse(buffer.strip)
               @log.debug("New score discovered: #{score}")
               save(threads, [score])
               cleanup(host, port, strength, threads)
               break
             end
-            break if stdout.eof?
+            if stdout.closed?
+              raise "Failed to calculate the score (##{thr.value}): #{buffer}" unless thr.value.to_i.zero?
+              break
+            end
             break unless @alive
-            sleep 0.1
+            sleep 0.25
           end
         rescue StandardError => e
           @log.error(Backtrace.new(e).to_s)

data/lib/zold/node/front.rb

@@ -27,6 +27,7 @@ require 'sinatra/base'
 require 'webrick'
 require 'get_process_mem'
 require 'diffy'
+require 'usagewatch_ext'
 require 'concurrent'
 require_relative '../backtrace'
 require_relative '../version'
@@ -66,7 +67,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 :network, 'test' # 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
@@ -162,13 +163,14 @@ while #{settings.address} is in '#{settings.network}'"
         score: score.to_h,
         pid: Process.pid,
         cpus: Concurrent.processor_count,
-        memory: GetProcessMem.new.bytes,
+        memory: GetProcessMem.new.bytes.to_i,
         platform: RUBY_PLATFORM,
+        load: Usagewatch.uw_load.to_f,
         uptime: `uptime`.strip,
         threads: "#{Thread.list.select { |t| t.status == 'run' }.count}/#{Thread.list.count}",
         wallets: settings.wallets.all.count,
         remotes: settings.remotes.all.count,
-        nscore: settings.remotes.all.map { |r| r[:score] }.inject(&:+),
+        nscore: settings.remotes.all.map { |r| r[:score] }.inject(&:+) || 0,
         farm: settings.farm.to_json,
         entrance: settings.entrance.to_json,
         date: Time.now.utc.iso8601,

data/lib/zold/version.rb

@@ -25,6 +25,6 @@
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 module Zold
-  VERSION = '0.14.35'
+  VERSION = '0.14.36'
   PROTOCOL = 2
 end

data/resources/remotes

@@ -1 +1,6 @@
 b1.zold.io,80,0,0
+b2.zold.io,4096,0,0
+159.203.63.90,4096,0,0
+167.99.77.100,4096,0,0
+159.203.19.189,4096,0,0
+138.197.140.42,4096,0,0

data/test/commands/test_remote.rb

@@ -155,7 +155,7 @@ class TestRemote < Minitest::Test
         )
         cmd.run(%W[remote add localhost #{port}])
       end
-      assert_equal(12, remotes.all.count)
+      assert_equal(11 + File.readlines('resources/remotes').count, remotes.all.count)
       cmd.run(%w[remote select --max-nodes=5])
       assert_equal(5, remotes.all.count)
     end

data/test/node/fake_node.rb

@@ -68,11 +68,13 @@ class FakeNode
           end
         end
         uri = "http://localhost:#{port}/"
-        while Zold::Http.new(uri: uri, score: nil).get.code == '599' && node.alive?
-          @log.debug("Waiting for #{uri}...")
-          sleep 1
+        loop do
+          ping = Zold::Http.new(uri: uri, score: nil, network: Zold::Front.network).get
+          break unless ping.code == '599' && node.alive?
+          @log.debug("Waiting for #{uri}: ##{ping.code}...")
+          sleep 0.5
         end
-        raise 'The node is dead' unless node.alive?
+        raise "The node is dead at #{uri}" unless node.alive?
         begin
           yield port
         ensure

data/test/node/test_farm.rb

@@ -40,7 +40,7 @@ class FarmTest < Minitest::Test
   def test_renders_in_json
     Dir.mktmpdir do |dir|
       farm = Zold::Farm.new('NOPREFIX6@ffffffffffffffff', File.join(dir, 'f'), log: test_log)
-      farm.start('localhost', 80, threads: 4, strength: 2) do
+      farm.start('localhost', 80, threads: 2, strength: 2) do
         assert_wait { !farm.best.empty? && !farm.best[0].value.zero? }
         count = 0
         100.times { count += farm.to_json[:best].length }
@@ -61,7 +61,7 @@ class FarmTest < Minitest::Test
   def test_makes_best_score_in_background
     Dir.mktmpdir do |dir|
       farm = Zold::Farm.new('NOPREFIX1@ffffffffffffffff', File.join(dir, 'f'), log: test_log)
-      farm.start('localhost', 80, threads: 4, strength: 3) do
+      farm.start('localhost', 80, threads: 1, strength: 3) do
         assert_wait { !farm.best.empty? && farm.best[0].value >= 3 }
         score = farm.best[0]
         assert(!score.expired?)
@@ -143,4 +143,10 @@ class FarmTest < Minitest::Test
       end
     end
   end
+
+  def test_terminates_farm_entirely
+    Zold::Farm.new('NOPREFIX4@ffffffffffffffff', log: test_log).start('localhost', 4096, threads: 1, strength: 10) do
+      sleep 1
+    end
+  end
 end

data/test/node/test_front.rb

@@ -32,6 +32,23 @@ require_relative '../../lib/zold/json_page'
 require_relative '../../lib/zold/score'
 
 class FrontTest < Minitest::Test
+  def test_renders_front_json
+    FakeNode.new(log: test_log).run(['--no-metronome', '--network=foo', '--threads=0']) do |port|
+      res = Zold::Http.new(uri: "http://localhost:#{port}/", network: 'foo', score: nil).get
+      json = JSON.parse(res.body)
+      assert_equal(Zold::VERSION, json['version'])
+      assert_equal(Zold::PROTOCOL, json['protocol'])
+      assert_equal('foo', json['network'])
+      assert(json['pid'].positive?)
+      assert(json['cpus'].positive?)
+      assert(json['memory'].positive?)
+      assert(json['load'].positive?)
+      assert(json['wallets'].positive?)
+      assert(json['remotes'].zero?)
+      assert(json['nscore'].zero?)
+    end
+  end
+
   def test_renders_public_pages
     FakeNode.new(log: test_log).run(['--ignore-score-weakness']) do |port|
       {
@@ -219,13 +236,7 @@ class FrontTest < Minitest::Test
           '*',
           response.header['Access-Control-Allow-Origin']
         )
-        score = Zold::Score.new(
-          time: Time.now, host: 'localhost', port: port, invoice: 'NOPREFIX@ffffffffffffffff', strength: 2
-        )
-        assert_equal(
-          score.to_s,
-          response.header[Zold::Http::SCORE_HEADER]
-        )
+        assert(!response.header[Zold::Http::SCORE_HEADER].nil?)
       end
     end
   end

data/test/test__helper.rb

@@ -85,7 +85,7 @@ module Minitest
       require_relative '../lib/zold/log'
       @test_log = Zold::Log::Verbose.new
       @test_log = Zold::Log::Quiet.new if ENV['TEST_QUIET_LOG']
-      @test_log
+      Zold::Log::Sync.new(@test_log)
     end
   end
 end

data/test/test_http.rb

@@ -51,4 +51,28 @@ class TestHttp < Minitest::Test
     res = Zold::Http.new(uri: 'http://good-host/', score: nil).get
     assert_equal('200', res.code)
   end
+
+  def test_sends_valid_network_header
+    stub_request(:get, 'http://some-host-1/')
+      .with(headers: { 'X-Zold-Network' => 'xyz' })
+      .to_return(status: 200)
+    res = Zold::Http.new(uri: 'http://some-host-1/', score: nil, network: 'xyz').get
+    assert_equal('200', res.code)
+  end
+
+  def test_sends_valid_protocol_header
+    stub_request(:get, 'http://some-host-2/')
+      .with(headers: { 'X-Zold-Protocol' => Zold::PROTOCOL })
+      .to_return(status: 200)
+    res = Zold::Http.new(uri: 'http://some-host-2/', score: nil).get
+    assert_equal('200', res.code)
+  end
+
+  def test_sends_valid_version_header
+    stub_request(:get, 'http://some-host-3/')
+      .with(headers: { 'X-Zold-Version' => Zold::VERSION })
+      .to_return(status: 200)
+    res = Zold::Http.new(uri: 'http://some-host-3/', score: nil).get
+    assert_equal('200', res.code)
+  end
 end

data/zold.gemspec

@@ -71,6 +71,7 @@ and suggests a different architecture for digital wallet maintenance.'
   s.add_runtime_dependency 'sinatra', '~>2.0'
   s.add_runtime_dependency 'slop', '~>4.4'
   s.add_runtime_dependency 'sys-proctable', '1.1.5'
+  s.add_runtime_dependency 'usagewatch_ext', '0.2.0'
   s.add_runtime_dependency 'xcop', '~>0.5'
   s.add_development_dependency 'codecov', '0.1.10'
   s.add_development_dependency 'minitest', '5.11.3'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.14.35
+  version: 0.14.36
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -248,6 +248,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.1.5
+- !ruby/object:Gem::Dependency
+  name: usagewatch_ext
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: xcop
   requirement: !ruby/object:Gem::Requirement