zold 0.5 → 0.6

data/lib/zold/commands/propagate.rb

@@ -61,21 +61,20 @@ Available options:"
       wallet.txns.select { |t| t.amount.negative? }.each do |t|
         target = @wallets.find(t.bnf)
         unless target.exists?
-          @log.debug("#{t.amount.mul(-1)} to #{t.bnf}: wallet is absent")
+          @log.debug("#{t.amount * -1} to #{t.bnf}: wallet is absent")
           next
         end
         next if target.has?(t.id, me)
         unless Prefixes.new(target).valid?(t.prefix)
-          @log.info("#{t.amount.mul(-1)} to #{t.bnf}: wrong prefix")
+          @log.info("#{t.amount * -1} to #{t.bnf}: wrong prefix")
           next
         end
         target.add(t.inverse(me))
-        @log.info("#{t.amount.mul(-1)} to #{t.bnf}")
+        @log.info("#{t.amount * -1} arrived to #{t.bnf}: #{t.details}")
         modified << t.id
       end
       modified.uniq!
-      @log.debug("Wallet #{me} propagated successfully, \
-#{modified.count} wallets affected")
+      @log.debug("Wallet #{me} propagated successfully, #{modified.count} wallets affected")
       modified
     end
   end

data/lib/zold/commands/push.rb

@@ -69,12 +69,17 @@ Available options:"
           next
         end
         json = JSON.parse(response.body)['score']
-        score = Score.new(
-          Time.parse(json['time']), json['host'],
-          json['port'], json['suffixes']
-        )
+        score = Score.parse_json(json)
         unless score.valid?
-          @log.error("#{uri} invalid score")
+          @log.error("#{uri} invalid score: #{score}")
+          next
+        end
+        if score.expired?
+          @log.error("#{uri} expired score: #{score}")
+          next
+        end
+        if score.strength < Score::STRENGTH
+          @log.error("#{uri} score is too weak")
           next
         end
         @log.info("#{uri} accepted: #{Rainbow(score.value).green}")

data/lib/zold/commands/remote.rb

@@ -50,9 +50,9 @@ Available commands:
       Remove all registered remote nodes
     #{Rainbow('remote reset').green}
       Restore it back to the default list of nodes
-    #{Rainbow('remote add').green} host port
+    #{Rainbow('remote add').green} host [port]
       Add a new remote node
-    #{Rainbow('remote remove').green} host port
+    #{Rainbow('remote remove').green} host [port]
       Remove the remote node
     #{Rainbow('remote update').green}
       Check each registered remote node for availability
@@ -62,7 +62,7 @@ Available options:"
           default: false
         o.bool '--help', 'Print instructions'
       end
-      command = args[0]
+      command = opts.arguments[0]
       case command
       when 'show'
         show
@@ -71,9 +71,9 @@ Available options:"
       when 'reset'
         reset
       when 'add'
-        add(opts.arguments[1], opts.arguments[2].to_i)
+        add(opts.arguments[1], opts.arguments[2] ? opts.arguments[2].to_i : Remotes::PORT)
       when 'remove'
-        remove(opts.arguments[1], opts.arguments[2].to_i)
+        remove(opts.arguments[1], opts.arguments[2] ? opts.arguments[2].to_i : Remotes::PORT)
       when 'update'
         update(opts)
         update(opts, false)
@@ -117,9 +117,7 @@ Available options:"
         res = Http.new(uri).get
         unless res.code == '200'
           @remotes.remove(r[:host], r[:port])
-          @log.info(
-            "#{Rainbow(r[:host]).red} #{res.code} \"#{res.message}\" #{uri}"
-          )
+          @log.info("#{Rainbow(r[:host]).red} #{res.code} \"#{res.message}\" #{uri}")
           next
         end
         begin
@@ -129,39 +127,39 @@ Available options:"
           @log.info("#{Rainbow(r[:host]).red} \"#{e.message}\": #{res.body}")
           next
         end
-        score = Score.new(
-          Time.parse(json['score']['time']), r[:host],
-          r[:port], json['score']['suffixes']
-        )
+        score = Score.parse_json(json['score'])
         unless score.valid?
           remove(r[:host], r[:port])
           @log.info("#{Rainbow(r[:host]).red} invalid score")
           next
         end
+        if score.expired?
+          remove(r[:host], r[:port])
+          @log.info("#{Rainbow(r[:host]).red} expired score")
+          next
+        end
         if score.strength < Score::STRENGTH && !opts['ignore-score-weakness']
           remove(r[:host], r[:port])
-          @log.info(
-            "#{Rainbow(r[:host]).red} score too weak: #{score.strength}"
-          )
+          @log.info("#{Rainbow(r[:host]).red} score too weak: #{score.strength}")
           next
         end
-        @remotes.rescore(r[:host], r[:port], score.value)
+        if r[:host] != score.host || r[:port] != score.port
+          @remotes.remove(r[:host], r[:port])
+          @remotes.add(score.host, score.port)
+          @log.info("#{r[:host]}:#{r[:port]} renamed to #{score.host}:#{score.port}")
+        end
+        @remotes.rescore(score.host, score.port, score.value)
         if deep
           json['all'].each do |s|
-            unless @remotes.exists?(s['host'], s['port'])
-              add(s['host'], s['port'])
-            end
+            add(s['host'], s['port']) unless @remotes.exists?(s['host'], s['port'])
           end
         end
-        @log.info("#{r[:host]}:#{r[:port]}: #{Rainbow(score.value).green} \
-(v.#{json['version']})")
+        @log.info("#{r[:host]}:#{r[:port]}: #{Rainbow(score.value).green} (v.#{json['version']})")
       end
       total = @remotes.all.size
       if total.zero?
         @log.debug("The list of remotes is #{Rainbow('empty').red}!")
-        @log.debug(
-          "Run 'zold remote add b1.zold.io 80` and then `zold update`"
-        )
+        @log.debug("Run 'zold remote add b1.zold.io` and then `zold update`")
       else
         @log.debug("There are #{total} known remotes")
       end

data/lib/zold/commands/show.rb

@@ -60,8 +60,7 @@ Available options:"
     def show(wallet, _)
       balance = wallet.balance
       wallet.txns.each do |t|
-        @log.info("##{t.id} #{t.date.utc.iso8601} \
-#{t.amount} #{t.bnf} #{t.details}")
+        @log.info(t.to_text)
       end
       @log.info("The balance of #{wallet}: #{balance}")
       balance

data/lib/zold/commands/taxes.rb

@@ -0,0 +1,154 @@
+# 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 'slop'
+require 'json'
+require_relative 'pay'
+require_relative '../log'
+require_relative '../score'
+require_relative '../id'
+require_relative '../tax'
+require_relative '../http'
+
+# TAXES command.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2018 Yegor Bugayenko
+# License:: MIT
+module Zold
+  # Taxes command
+  class Taxes
+    def initialize(wallets:, remotes:, log: Log::Quiet.new)
+      @wallets = wallets
+      @remotes = remotes
+      @log = log
+    end
+
+    def run(args = [])
+      opts = Slop.parse(args, help: true) do |o|
+        o.banner = "Usage: zold taxes command [options]
+Available commands:
+    #{Rainbow('taxes pay').green} wallet
+      Pay taxes for the given wallet
+    #{Rainbow('taxes show').green}
+      Show taxes status for the given wallet
+    #{Rainbow('taxes debt').green}
+      Show current debt
+Available options:"
+        o.string '--private-key',
+          'The location of RSA private key (default: ~/.ssh/id_rsa)',
+          require: true,
+          default: '~/.ssh/id_rsa'
+        o.bool '--help', 'Print instructions'
+      end
+      command = opts.arguments[0]
+      case command
+      when 'show'
+        raise 'At least one wallet ID is required' unless opts.arguments[1]
+        opts.arguments[1..-1].each do |id|
+          show(@wallets.find(Id.new(id), opts))
+        end
+      when 'debt'
+        raise 'At least one wallet ID is required' unless opts.arguments[1]
+        opts.arguments[1..-1].each do |id|
+          debt(@wallets.find(Id.new(id), opts))
+        end
+      when 'pay'
+        raise 'At least one wallet ID is required' unless opts.arguments[1]
+        opts.arguments[1..-1].each do |id|
+          pay(@wallets.find(Id.new(id)), opts)
+        end
+      else
+        @log.info(opts.to_s)
+      end
+    end
+
+    def pay(wallet, _)
+      raise 'The wallet is absent' unless wallet.exists?
+      tax = Tax.new(wallet)
+      debt = tax.debt
+      @log.debug("The current debt is #{debt} (#{debt.to_i} zents)")
+      if debt <= Tax::TRIAL
+        @log.debug("No need to pay taxes yet, until the debt is less than #{Tax::TRIAL} (#{Tax::TRIAL.to_i} zents)")
+        return
+      end
+      top = top_scores
+      while debt > Amount::ZERO
+        raise 'No acceptable remote nodes, try later' if top.empty?
+        best = top.shift
+        txn = tax.pay(Zold::Key.new(file: opts['private-key']), best)
+        wallet.add(txn)
+        debt -= txn.amount
+        @log.info("#{txn.amount} of taxes paid to #{txn.bnf}, #{debt} left to pay")
+      end
+      @log.info('The wallet is in good standing, all taxes paid')
+    end
+
+    def debt(wallet, _)
+      raise 'The wallet is absent' unless wallet.exists?
+      tax = Tax.new(wallet)
+      @log.info(tax.debt)
+    end
+
+    def show(_, _)
+      raise 'Not implemented yet'
+    end
+
+    private
+
+    def top_scores
+      best = []
+      @remotes.all.each do |r|
+        uri = URI(r[:home])
+        name = "#{r[:host]}:#{r[:port]}"
+        res = Http.new(uri).get
+        unless res.code == '200'
+          @log.info("#{name}: #{Rainbow(res.code).red} \"#{res.message}\" at #{uri}")
+          next
+        end
+        begin
+          json = JSON.parse(res.body)
+        rescue JSON::ParserError => e
+          @log.info("#{name}: #{Rainbow('broken').red} JSON \"#{e.message}\": #{res.body}")
+          next
+        end
+        score = Score.parse_json(json['score'])
+        unless score.valid?
+          @log.info("#{name}: #{Rainbow('invalid').red} score")
+          next
+        end
+        if score.expired?
+          @log.info("#{name}: #{Rainbow('expired').red} score")
+          next
+        end
+        if score.strength < Score::STRENGTH
+          @log.info("#{name} score #{Rainbow(score.value).red} is too weak (<#{Score::STRENGTH})")
+          next
+        end
+        if score.value < Tax::MIN_SCORE
+          @log.info("#{name} score #{Rainbow(score.value).red} is too small (<#{Tax::MIN_SCORE})")
+          next
+        end
+        @log.info("#{score.host}:#{score.port}: #{Rainbow(score.value).green}")
+        best << score
+      end
+      best.sort_by(&:value).reverse
+    end
+  end
+end

data/lib/zold/http.rb

@@ -66,9 +66,7 @@ module Zold
         'User-Agent': "Zold #{VERSION}",
         'Connection': 'close'
       }
-      if @score.valid? && @score.value >= 3
-        headers[SCORE_HEADER] = score.reduced(4).to_s
-      end
+      headers[SCORE_HEADER] = score.reduced(4).to_s if @score.valid? && @score.value >= 3 && !score.expired?
       headers
     end
   end

data/lib/zold/key.rb

@@ -34,9 +34,7 @@ module Zold
       @body = lambda do
         unless file.nil?
           path = File.expand_path(file)
-          unless File.exist?(path)
-            raise "Can't find RSA key at #{file} (#{path})"
-          end
+          raise "Can't find RSA key at #{file} (#{path})" unless File.exist?(path)
           return File.read(path)
         end
         unless text.nil?

data/lib/zold/node/entrance.rb

@@ -22,6 +22,7 @@ require 'concurrent'
 require_relative '../log'
 require_relative '../remotes'
 require_relative '../copies'
+require_relative '../tax'
 require_relative '../commands/merge'
 require_relative '../commands/fetch'
 require_relative '../commands/push'
@@ -52,15 +53,19 @@ module Zold
     def push_unsafe(id, body)
       copies = Copies.new(File.join(@copies, id.to_s))
       copies.add(body, 'remote', Remotes::PORT, 0)
-      Zold::Fetch.new(
+      Fetch.new(
         remotes: @remotes, copies: copies.root, log: @log
       ).run([id.to_s, "--ignore-node=#{@address}"])
-      modified = Zold::Merge.new(
+      modified = Merge.new(
         wallets: @wallets, copies: copies.root, log: @log
       ).run([id.to_s])
+      debt = Tax.new(@wallets.find(id)).debt
+      if debt > Tax::TRIAL
+        raise "Taxes are not paid, the debt is #{debt} (#{debt.to_i} zents), won't promote the wallet"
+      end
       copies.remove('remote', Remotes::PORT)
       modified.each do |m|
-        Zold::Push.new(
+        Push.new(
           wallets: @wallets, remotes: @remotes, log: @log
         ).run([m.to_s])
       end

data/lib/zold/node/farm.rb

@@ -30,8 +30,9 @@ module Zold
   # Farm
   class Farm
     attr_reader :best
-    def initialize(log: Log::Quiet.new)
+    def initialize(invoice, log: Log::Quiet.new)
       @log = log
+      @invoice = invoice
       @scores = []
       @threads = []
       @best = []
@@ -50,7 +51,7 @@ module Zold
     def start(host, port, strength: 8, threads: 8)
       @log.debug('Zero-threads farm won\'t score anything!') if threads.zero?
       @scores = Queue.new
-      first = Score.new(Time.now, host, port, strength: strength)
+      first = Score.new(Time.now, host, port, @invoice, strength: strength)
       @best = [first]
       @scores << first
       @threads = (1..threads).map do |t|
@@ -64,12 +65,13 @@ module Zold
               @best << s
               after = @best.map(&:value).max
               @best.reject! { |b| b.value < after }
-              if before != after
-                @log.debug("#{Thread.current.name}: best is #{@best[0]}")
-              end
+              @log.debug("#{Thread.current.name}: best is #{@best[0]}") if before != after
             end
             if @scores.length < 4
-              @scores << Score.new(Time.now, host, port, strength: strength)
+              @scores << Score.new(
+                Time.now, host, port, @invoice,
+                strength: strength
+              )
             end
             @scores << s.next
           end

data/lib/zold/node/front.rb

@@ -60,7 +60,6 @@ module Zold
       if request.env[Http::SCORE_HEADER] && !settings.remotes.empty?
         s = Score.parse(request.env[Http::SCORE_HEADER])
         error(400, 'The score is invalid') unless s.valid?
-        error(400, 'The score is weak') if s.strength < Score::STRENGTH
         settings.remotes.add(s.host, s.port) if s.value > 3
       end
     end

data/lib/zold/patch.rb

@@ -44,7 +44,7 @@ module Zold
           (txn.id <= max ||
           @txns.find { |t| t.id == txn.id } ||
           @txns.map(&:amount).inject(&:+) < txn.amount)
-        next unless Signature.new.valid?(@key, txn)
+        next unless Signature.new.valid?(@key, wallet.id, txn)
         @txns << txn
       end
     end

data/lib/zold/remotes.rb

@@ -67,6 +67,7 @@ module Zold
       raise 'Port has to be of type Integer' unless port.is_a?(Integer)
       raise 'Port can\'t be negative' if port < 0
       raise 'Port can\'t be over 65536' if port > 0xffff
+      raise "#{host}:#{port} alread exists" if exists?(host, port)
       list = load
       list << { host: host.downcase, port: port, score: 0 }
       list.uniq! { |r| "#{r[:host]}:#{r[:port]}" }
@@ -75,6 +76,7 @@ module Zold
 
     def remove(host, port = Remotes::PORT)
       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.reject! { |r| r[:host] == host.downcase && r[:port] == port }
       save(list)
@@ -82,11 +84,13 @@ module Zold
 
     def score(host, port = Remotes::PORT)
       raise 'Port has to be of type Integer' unless port.is_a?(Integer)
+      raise "#{host}:#{port} is absent" unless exists?(host, port)
       load.find { |r| r[:host] == host.downcase && r[:port] == port }[:score]
     end
 
     def rescore(host, port, score)
       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 do |r|
         r[:host] == host.downcase && r[:port] == port