zold 0.18.5 → 0.18.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 107b5e77f3c4f52c9331511957365add6116ffaf33fd8c1a0ffe61d86658deca
-  data.tar.gz: 38a6934d82c1fe5fafa93109bf587c5d108e703eaa8b832330845fd110be6b30
+  metadata.gz: 3cef493a42202430232e9c904a25258bdf6c59336c3f6732687b1412713f93d1
+  data.tar.gz: 8ff76340ba5810cf0ccb241c61505fcc1c8f9b0c7efa49b40f49fb312ff0370f
 SHA512:
-  metadata.gz: 30fc094ba1a6e69eb1e2dc8ca2b735197f29e8834c79baac950e3b1e873876beeaee169761115d9a8d50b0bbbfd8d453b9c5b6705ce0231aa5f4ed7dea5479f3
-  data.tar.gz: 92bdb792f17ba0d73b8375139dc510ac1897a637d95db712275423cbcadf4028a03ce3dc80290b37c32b55f95095a5d964b45a47043b7004c30925ed010d5621
+  metadata.gz: 5ffcaa34424091b2f97ce0f3a12cca71b983c32332a7ddeef69d6cdfd89ed507a8539f4baa2cf909ec30675721aea4b7add652fba881192113df3b97b6fd1cd2
+  data.tar.gz: b1e80e8a217ba00c6a1c6b15a8efc48c1687f7295607c529a2d322b763fd001d019bb87411e3815532f7a9117f7e41f88a137e3e666c74c20fb42db401e14986

data/lib/zold/commands/node.rb

@@ -274,10 +274,10 @@ module Zold
             @log.info("Starting up the web front at http://#{host}:#{opts[:port]}...")
             Front.run!
             @log.info("The web front stopped at http://#{host}:#{opts[:port]}")
-            @log.info('Thanks for helping Zold network!')
           end
         end
       end
+      @log.info('Thanks for helping Zold network!')
     end
 
     private
@@ -363,8 +363,6 @@ module Zold
         @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))
       require_relative 'routines/gc'
       metronome.add(Routines::Gc.new(opts, @wallets, log: @log))
       unless opts['standalone']

data/lib/zold/metronome.rb

@@ -87,11 +87,10 @@ module Zold
       ensure
         start = Time.now
         unless @threads.empty?
-          @log.info("Stopping the metronome with #{@threads.count} threads: #{@threads.map(&:name).join(', ')}")
-          @threads.each do |t|
-            t.kill
-            t.join
-          end
+          @log.info("Stopping the metronome with #{@threads.count} threads...")
+          @threads.each(&:kill)
+          @threads.each(&:join)
+          @log.info("Metronome #{@threads.count} threads killed")
         end
         @log.info("Metronome stopped in #{Age.new(start)}, #{@failures.count} failures")
       end

data/lib/zold/node/async_entrance.rb

@@ -75,7 +75,10 @@ module Zold
         begin
           yield(self)
         ensure
+          @log.info("AsyncEntrance stopping and killing #{@threads.count} threads...")
           @threads.each(&:kill)
+          @threads.each(&:join)
+          @log.info("AsyncEntrance stopped, #{@threads.count} threads killed")
         end
       end
     end

data/lib/zold/node/farm.rb

@@ -93,11 +93,10 @@ module Zold
       ].flatten.join("\n\n")
     end
 
+    # Renders the Farm into JSON to show for the end-user in front.rb.
     def to_json
       {
-        threads: @threads.map do |t|
-          "#{t.name}/#{t.status}/#{t.alive? ? 'alive' : 'dead'}"
-        end.join(', '),
+        threads: @threads.map { |t| "#{t.name}/#{t.status}/#{t.alive? ? 'alive' : 'dead'}" }.join(', '),
         pipeline: @pipeline.size,
         best: best.map(&:to_mnemo).join(', '),
         farmer: @farmer.class.name
@@ -123,7 +122,7 @@ module Zold
         @log.info("#{best.size} scores pre-loaded from #{@cache}, the best is: #{best[0]}")
       end
       @threads = (1..threads).map do |t|
-        Thread.new do
+        Thread.start do
           Thread.current.thread_variable_set(:tid, t.to_s)
           Endless.new("f#{t}", log: @log).run do
             cycle(host, port, threads)
@@ -132,7 +131,7 @@ module Zold
       end
       unless threads.zero?
         ready = false
-        @threads << Thread.new do
+        @threads << Thread.start do
           Endless.new('cleanup', log: @log).run do
             cleanup(host, port, threads)
             ready = true
@@ -151,8 +150,10 @@ at #{host}:#{port}, strength is #{@strength}")
       begin
         yield(self)
       ensure
+        @log.info("Farm stopping with #{threads} threads...")
         @threads.each(&:kill)
-        @log.info("Farm stopped (threads=#{threads}, strength=#{@strength})")
+        @threads.each(&:join)
+        @log.info("Farm stopped, #{threads} threads killed")
       end
     end
 

data/lib/zold/node/front.rb

@@ -107,6 +107,7 @@ while #{settings.address} is in '#{settings.opts['network']}'")
         else
           s = Score.parse(header)
           error(400, 'The score is invalid') unless s.valid?
+          error(400, 'The score is expired') if s.expired?
           error(400, 'The score is weak') if s.strength < Score::STRENGTH && !settings.opts['ignore-score-weakness']
           return if s.value < Front::MIN_SCORE && !settings.opts['ignore-score-weakness']
           if settings.address == "#{s.host}:#{s.port}" && !settings.opts['ignore-score-weakness']
@@ -130,6 +131,7 @@ while #{settings.address} is in '#{settings.opts['network']}'")
       headers['Cache-Control'] = 'no-cache'
       headers['X-Zold-Path'] = request.url
       headers['X-Zold-Version'] = settings.opts['expose-version']
+      headers['X-Zold-Repo'] = Zold::REPO
       headers[Http::PROTOCOL_HEADER] = settings.protocol.to_s
       headers['Access-Control-Allow-Origin'] = '*'
       headers[Http::SCORE_HEADER] = score.reduced(Front::MIN_SCORE).to_s
@@ -194,7 +196,7 @@ from #{request.ip} in #{Age.new(@start, limit: 1)}")
     get '/' do
       content_type('application/json')
       pretty(
-        repo: 'zold-io/zold',
+        repo: Zold::REPO,
         version: settings.opts['expose-version'],
         alias: settings.node_alias,
         network: settings.opts['network'],

data/lib/zold/remotes.rb

@@ -194,7 +194,7 @@ module Zold
       list.each do |r|
         pool.post do
           Thread.current.abort_on_exception = true
-          Thread.current.name = "remotes-#{idx}@#{r[:host]}:#{r[:port]}"
+          Thread.current.name = "remotes-#{idx.value}@#{r[:host]}:#{r[:port]}"
           start = Time.now
           begin
             yield Remotes::Remote.new(

data/lib/zold/version.rb

@@ -25,6 +25,7 @@
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 module Zold
-  VERSION = '0.18.5'
+  VERSION = '0.18.6'
   PROTOCOL = 2
+  REPO = 'zold-io/zold'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.18.5
+  version: 0.18.6
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -578,7 +578,6 @@ files:
 - lib/zold/commands/remove.rb
 - lib/zold/commands/routines/gc.rb
 - lib/zold/commands/routines/reconnect.rb
-- lib/zold/commands/routines/spread.rb
 - lib/zold/commands/show.rb
 - lib/zold/commands/taxes.rb
 - lib/zold/commands/thread_badge.rb
@@ -628,7 +627,6 @@ files:
 - resources/root.pub
 - test/commands/routines/test_gc.rb
 - test/commands/routines/test_reconnect.rb
-- test/commands/routines/test_spread.rb
 - test/commands/test_alias.rb
 - test/commands/test_calculate.rb
 - test/commands/test_clean.rb
@@ -703,7 +701,7 @@ licenses:
 - MIT
 metadata: {}
 post_install_message: |-
-  Thanks for installing Zold 0.18.5!
+  Thanks for installing Zold 0.18.6!
     Study our White Paper: https://papers.zold.io/wp.pdf
     Read our blog posts: https://blog.zold.io
     Try online wallet at: https://wts.zold.io
@@ -737,7 +735,6 @@ test_files:
 - features/support/env.rb
 - test/commands/routines/test_gc.rb
 - test/commands/routines/test_reconnect.rb
-- test/commands/routines/test_spread.rb
 - test/commands/test_alias.rb
 - test/commands/test_calculate.rb
 - test/commands/test_clean.rb

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

@@ -1,62 +0,0 @@
-# frozen_string_literal: true
-
-# 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_relative '../../log'
-require_relative '../../id'
-require_relative '../push'
-
-# Spread random wallets to the network.
-# Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2018 Yegor Bugayenko
-# License:: MIT
-module Zold
-  # Routines module
-  module Routines
-    # Spread them
-    class Spread
-      def initialize(opts, wallets, remotes, log: Log::NULL)
-        @opts = opts
-        @wallets = wallets
-        @remotes = remotes
-        @log = log
-      end
-
-      def exec(_ = 0)
-        return if @remotes.all.empty?
-        if @opts['routine-immediately']
-          @log.info('Spreading the wallets immediately, because of --routine-immediately')
-        else
-          sleep(60)
-        end
-        ids = @wallets.all.sample(10)
-        Push.new(wallets: @wallets, remotes: @remotes, log: @log).run(
-          ['push', "--network=#{@opts['network']}"] + ids.map(&:to_s)
-        )
-        if ids.empty?
-          @log.info("Spread didn't push any wallets, we are empty")
-        else
-          @log.info("Spread #{ids.count} random wallets out of #{@wallets.all.count}: #{ids.join(', ')}")
-        end
-      end
-    end
-  end
-end

data/test/commands/routines/test_spread.rb

@@ -1,45 +0,0 @@
-# frozen_string_literal: true
-
-# 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 'minitest/autorun'
-require 'webmock/minitest'
-require_relative '../../test__helper'
-require_relative '../../fake_home'
-require_relative '../../node/fake_node'
-require_relative '../../../lib/zold/commands/routines/spread.rb'
-require_relative '../../../lib/zold/node/entrance.rb'
-
-# Spread test.
-# Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2018 Yegor Bugayenko
-# License:: MIT
-class TestSpread < Zold::Test
-  def test_spread_wallets
-    FakeHome.new(log: test_log).run do |home|
-      5.times { home.create_wallet }
-      opts = {
-        'routine-immediately' => true
-      }
-      Zold::Routines::Spread.new(opts, home.wallets, home.remotes, log: test_log).exec
-    end
-  end
-end