zold 0.14.8 → 0.14.9

data/lib/zold/commands/remote.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2018 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -138,7 +140,7 @@ Available options:"
 
     def show
       @remotes.all.each do |r|
-        score = Rainbow("/#{r[:score]}").color(r[:score] > 0 ? :green : :red)
+        score = Rainbow("/#{r[:score]}").color(r[:score].positive? ? :green : :red)
         @log.info(r[:host] + Rainbow(":#{r[:port]}").gray + score)
       end
     end
@@ -155,7 +157,7 @@ Available options:"
 
     def add(host, port, opts)
       unless opts['skip-ping']
-        res = Http.new("http://#{host}:#{port}/version", network: opts['network']).get
+        res = Http.new(uri: "http://#{host}:#{port}/version", score: nil, network: opts['network']).get
         raise "The node #{host}:#{port} is not responding (code is #{res.code})" unless res.code == '200'
       end
       if @remotes.exists?(host, port)
@@ -251,10 +253,13 @@ in #{(Time.now - start).round(2)}s")
       end
     end
 
-    # @todo #292:30min Implement the logic of selecting the nodes as per #292.
-    #  The strongest n nodes should be selected, where n = opts['max-nodes'].
-    def select(_opts)
-      raise NotImplementedError, 'This feature is not yet implemented.'
+    def select(opts)
+      max_nodes = opts['max-nodes']
+      @log.info("Selecting #{max_nodes} strongest nodes.")
+      selected_remotes = @remotes.all.sort_by { |remote| remote[:score] }.first(max_nodes)
+      (@remotes.all - selected_remotes).each do |weak_remote|
+        @remotes.remove(weak_remote[:host], weak_remote[:port])
+      end
     end
 
     def terminate

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

@@ -0,0 +1,78 @@
+# 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 '../remote'
+require_relative '../pull'
+require_relative '../pay'
+require_relative '../push'
+
+# Pay bonuses routine.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2018 Yegor Bugayenko
+# License:: MIT
+module Zold
+  # Routines module
+  module Routines
+    # Pay bonuses to random nodes
+    class Bonuses
+      def initialize(opts, wallets, remotes, copies, farm, log: Log::Quiet.new)
+        @opts = opts
+        @wallets = wallets
+        @remotes = remotes
+        @copies = copies
+        @farm = farm
+        @log = log
+      end
+
+      def exec(_ = 0)
+        sleep(@opts['bonus-time'] * 60) unless @opts['routine-immediately']
+        raise '--private-key is required to pay bonuses' unless @opts['private-key']
+        raise '--bonus-wallet is required to pay bonuses' unless @opts['bonus-wallet']
+        raise '--bonus-amount is required to pay bonuses' unless @opts['bonus-amount']
+        winners = Remote.new(remotes: @remotes, log: @log, farm: @farm).run(
+          ['remote', 'elect', @opts['bonus-wallet'], '--private-key', @opts['private-key']] +
+          (@opts['ignore-score-weakness'] ? ['--ignore-score-weakness'] : [])
+        )
+        return if winners.empty?
+        unless @wallets.find(Id.new(@opts['bonus-wallet'])).exists?
+          Pull.new(wallets: @wallets, remotes: @remotes, copies: @copies, log: @log).run(
+            ['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,
+              "Hosting bonus for #{score.host} #{score.port} #{score.value}",
+              '--private-key', @opts['private-key']
+            ]
+          )
+        end
+        Push.new(wallets: @wallets, remotes: @remotes, log: @log).run(
+          ['push', @opts['bonus-wallet']] +
+          (@opts['ignore-score-weakness'] ? ['--ignore-score-weakness'] : [])
+        )
+      end
+    end
+  end
+end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2018 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2018 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/zold/commands/show.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2018 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/zold/commands/taxes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2018 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/zold/copies.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2018 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -88,11 +90,11 @@ module Zold
     def add(content, host, port, score, time = Time.now)
       raise "Content can't be empty" if content.empty?
       raise 'TCP port must be of type Integer' unless port.is_a?(Integer)
-      raise "TCP port can't be negative: #{port}" if port < 0
+      raise "TCP port can't be negative: #{port}" if port.negative?
       raise 'Time must be of type Time' unless time.is_a?(Time)
       raise "Time must be in the past: #{time}" if time > Time.now
       raise 'Score must be Integer' unless score.is_a?(Integer)
-      raise "Score can't be negative: #{score}" if score < 0
+      raise "Score can't be negative: #{score}" if score.negative?
       @mutex.synchronize do
         FileUtils.mkdir_p(@dir)
         list = load

data/lib/zold/hexnum.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2018 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/zold/http.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2018 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -24,6 +26,7 @@ require 'net/http'
 require_relative 'backtrace'
 require_relative 'version'
 require_relative 'score'
+require_relative 'type'
 
 # HTTP page.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -31,48 +34,53 @@ require_relative 'score'
 # License:: MIT
 module Zold
   # Http page
-  class Http
+  class Http < Dry::Struct
     # HTTP header we add to each HTTP request, in order to inform
     # the other node about the score. If the score is big enough,
     # the remote node will add us to its list of remote nodes.
-    SCORE_HEADER = 'X-Zold-Score'.freeze
+    SCORE_HEADER = 'X-Zold-Score'
 
     # HTTP header we add, in order to inform the node about our
     # version. This is done mostly in order to let the other node
     # reboot itself, if the version is higher.
-    VERSION_HEADER = 'X-Zold-Version'.freeze
+    VERSION_HEADER = 'X-Zold-Version'
 
     # 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
+    NETWORK_HEADER = 'X-Zold-Network'
 
-    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
+    # @todo #98:30m/DEV The following two statements are seen as issues by rubocop
+    #  raising a Lint/AmbiguousBlockAssociation offense. It is somthing
+    #  that could be solved by changing the TargetRubyVersion in .rubocop.yml
+    #  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 :network, Types::Strict::String.optional.default('test')
 
     def get
-      http = Net::HTTP.new(@uri.host, @uri.port)
+      http = Net::HTTP.new(uri.host, uri.port)
       http.read_timeout = 8
       http.open_timeout = 4
-      path = @uri.path
-      path += '?' + @uri.query if @uri.query
+      path = uri.path
+      path += '?' + uri.query if uri.query
       http.request_get(path, headers)
     rescue StandardError => e
       Error.new(e)
     end
 
     def put(body)
-      http = Net::HTTP.new(@uri.host, @uri.port)
+      http = Net::HTTP.new(uri.host, uri.port)
       http.read_timeout = 16
       http.open_timeout = 4
-      path = @uri.path
-      path += '?' + @uri.query if @uri.query
+      path = uri.path
+      path += '?' + uri.query if uri.query
       http.request_put(
         path, body,
         headers.merge(
@@ -112,8 +120,8 @@ 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[Http::NETWORK_HEADER] = network
+      headers[Http::SCORE_HEADER] = score.reduced(4).to_text if score.valid? && !score.expired? && score.value > 3
       headers
     end
   end

data/lib/zold/hungry_wallets.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'delegate'
 
 module Zold

data/lib/zold/id.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2018 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/zold/json_page.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2018 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/zold/key.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2018 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/zold/log.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2018 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/zold/metronome.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2018 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/zold/node/async_entrance.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2018 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -77,10 +79,8 @@ module Zold
 
     def to_json
       @entrance.to_json.merge(
-        'pool.completed_task_count': @pool.completed_task_count,
-        'pool.largest_length': @pool.largest_length,
+        'queue': queue.count,
         'pool.length': @pool.length,
-        'pool.queue_length': @pool.queue_length,
         'pool.running': @pool.running?
       )
     end

data/lib/zold/node/emission.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2018 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/zold/node/entrance.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2018 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -60,7 +62,8 @@ module Zold
 
     def to_json
       {
-        history: @history.join(', ')
+        'history': @history.join(', '),
+        'history_size': @history.count
       }
     end
 
@@ -76,7 +79,7 @@ module Zold
       unless @remotes.all.empty?
         Fetch.new(
           wallets: @wallets, remotes: @remotes, copies: copies.root, log: @log
-        ).run(['fetch', id.to_s, "--ignore-node=#{@address}", "--network=#{@network}"])
+        ).run(['fetch', id.to_s, "--ignore-node=#{@address}", "--network=#{@network}", '--quiet-if-absent'])
       end
       modified = Merge.new(
         wallets: @wallets, copies: copies.root, log: @log

data/lib/zold/node/farm.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2018 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -121,7 +123,7 @@ module Zold
     def cleanup(host, port, strength, threads)
       scores = load
       before = scores.map(&:value).max.to_i
-      save(threads, [Score.new(Time.now, host, port, @invoice, strength: strength)])
+      save(threads, [Score.new(time: Time.now, host: host, port: port, invoice: @invoice, strength: strength)])
       scores = load
       push(scores)
       after = scores.map(&:value).max.to_i

data/lib/zold/node/front.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2018 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -131,6 +133,7 @@ module Zold
       JSON.pretty_generate(
         version: settings.version,
         network: settings.network,
+        protocol: settings.protocol,
         score: score.to_h,
         pid: Process.pid,
         cpus: Concurrent.processor_count,
@@ -203,7 +206,7 @@ module Zold
         wallet.network,
         wallet.protocol,
         wallet.id.to_s,
-        wallet.key.to_s,
+        wallet.key.to_pub,
         '',
         wallet.txns.map(&:to_text).join("\n"),
         '',

data/lib/zold/node/safe_entrance.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2018 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/zold/node/spread_entrance.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2018 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/zold/patch.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2018 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/zold/prefixes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2018 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/zold/remotes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2018 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -77,7 +79,7 @@ module Zold
       end
 
       def http(path = '/')
-        Http.new("http://#{@host}:#{@port}#{path}", @score, network: @network)
+        Http.new(uri: "http://#{@host}:#{@port}#{path}", score: @score, network: @network)
       end
 
       def to_s
@@ -155,12 +157,11 @@ module Zold
       raise 'Port can\'t be nil' if port.nil?
       raise 'Port has to be of type Integer' unless port.is_a?(Integer)
       raise 'Port can\'t be zero' if port.zero?
-      raise 'Port can\'t be negative' if port < 0
+      raise 'Port can\'t be negative' if port.negative?
       raise 'Port can\'t be over 65536' if port > 0xffff
       raise "#{host}:#{port} already exists" if exists?(host, port)
       list = load
       list << { host: host.downcase, port: port, score: 0 }
-      list.uniq! { |r| "#{r[:host]}:#{r[:port]}" }
       save(list)
     end
 
@@ -168,7 +169,6 @@ module Zold
       raise 'Port has to be of type Integer' unless port.is_a?(Integer)
       raise 'Host can\'t be nil' if host.nil?
       raise 'Port can\'t be nil' if port.nil?
-      raise "#{host}:#{port} is absent" unless exists?(host, port)
       list = load
       list.reject! { |r| r[:host] == host.downcase && r[:port] == port }
       save(list)
@@ -211,10 +211,7 @@ in #{(Time.now - start).round}s; errors=#{errors}")
       raise 'Host can\'t be nil' if host.nil?
       raise 'Port can\'t be nil' if port.nil?
       raise 'Port has to be of type Integer' unless port.is_a?(Integer)
-      list = load
-      raise "#{host}:#{port} is absent among #{list.count} remotes" unless exists?(host, port)
-      list.find { |r| r[:host] == host.downcase && r[:port] == port }[:errors] += 1
-      save(list)
+      if_present(host, port) { |r| r[:errors] += 1 }
     end
 
     def rescore(host, port, score)
@@ -222,14 +219,19 @@ in #{(Time.now - start).round}s; errors=#{errors}")
       raise 'Port can\'t be nil' if port.nil?
       raise 'Score can\'t be nil' if score.nil?
       raise 'Port has to be of type Integer' unless port.is_a?(Integer)
-      raise "#{host}:#{port} is absent" unless exists?(host, port)
-      list = load
-      list.find { |r| r[:host] == host.downcase && r[:port] == port }[:score] = score
-      save(list)
+      if_present(host, port) { |r| r[:score] = score }
     end
 
     private
 
+    def if_present(host, port)
+      list = load
+      remote = list.find { |r| r[:host] == host.downcase && r[:port] == port }
+      return unless remote
+      yield remote
+      save(list)
+    end
+
     def load
       @mutex.synchronize do
         raw = CSV.read(file).map do |r|
@@ -250,7 +252,7 @@ in #{(Time.now - start).round}s; errors=#{errors}")
     def save(list)
       @mutex.synchronize do
         AtomicFile.new(file).write(
-          list.map do |r|
+          list.uniq { |r| "#{r[:host]}:#{r[:port]}" }.map do |r|
             [
               r[:host],
               r[:port],