zold 0.14.28 → 0.14.29

data/lib/zold/commands/push.rb

@@ -59,50 +59,51 @@ Available options:"
       mine = Args.new(opts, @log).take || return
       mine = @wallets.all if mine.empty?
       mine.map { |i| Id.new(i) }.each do |id|
-        wallet = @wallets.find(id)
-        raise "The wallet #{id} is absent" unless wallet.exists?
-        push(wallet, opts)
+        push(id, opts)
       end
     end
 
     private
 
-    def push(wallet, opts)
+    def push(id, opts)
       total = 0
       nodes = 0
       done = 0
       @remotes.iterate(@log) do |r|
         nodes += 1
-        total += push_one(wallet, r, opts)
+        total += push_one(id, r, opts)
         done += 1
       end
       raise "There are no remote nodes, run 'zold remote reset'" if nodes.zero?
-      raise "No nodes out of #{nodes} accepted the wallet #{wallet.id}" if done.zero?
-      @log.info("Push finished to #{done} nodes out of #{nodes}, total score for #{wallet.id} is #{total}")
+      raise "No nodes out of #{nodes} accepted the wallet #{id}" if done.zero?
+      @log.info("Push finished to #{done} nodes out of #{nodes}, total score for #{id} is #{total}")
     end
 
-    def push_one(wallet, r, opts)
+    def push_one(id, r, opts)
       if opts['ignore-node'].include?(r.to_s)
         @log.debug("#{r} ignored because of --ignore-node")
         return 0
       end
       start = Time.now
-      content = AtomicFile.new(wallet.path).read
-      response = r.http("/wallet/#{wallet.id}#{opts['sync'] ? '?sync=true' : ''}").put(content)
-      if response.code == '304'
-        @log.info("#{r}: same version #{content.length}b/#{wallet.txns.count}t \
+      @wallets.find(id) do |wallet|
+        raise "The wallet #{id} is absent" unless wallet.exists?
+        content = AtomicFile.new(wallet.path).read
+        response = r.http("/wallet/#{wallet.id}#{opts['sync'] ? '?sync=true' : ''}").put(content)
+        if response.code == '304'
+          @log.info("#{r}: same version #{content.length}b/#{wallet.txns.count}t \
 of #{wallet.id} there, in #{(Time.now - start).round(2)}s")
-        return 0
-      end
-      r.assert_code(200, response)
-      json = JsonPage.new(response.body).to_hash
-      score = Score.parse_json(json['score'])
-      r.assert_valid_score(score)
-      r.assert_score_ownership(score)
-      r.assert_score_strength(score) unless opts['ignore-score-weakness']
-      @log.info("#{r} accepted #{content.length}b/#{wallet.digest[0, 6]}/#{wallet.txns.count}t of #{wallet.id} \
+          return 0
+        end
+        r.assert_code(200, response)
+        json = JsonPage.new(response.body).to_hash
+        score = Score.parse_json(json['score'])
+        r.assert_valid_score(score)
+        r.assert_score_ownership(score)
+        r.assert_score_strength(score) unless opts['ignore-score-weakness']
+        @log.info("#{r} accepted #{content.length}b/#{wallet.digest[0, 6]}/#{wallet.txns.count}t of #{wallet.id} \
 in #{(Time.now - start).round(2)}s: #{Rainbow(score.value).green} (#{json['version']})")
-      score.value
+        score.value
+      end
     end
   end
 end

data/lib/zold/commands/remote.rb

@@ -80,15 +80,15 @@ Available options:"
         o.bool '--ignore-score-value',
           'Don\'t complain when their score is too small',
           default: false
+        o.array '--ignore-node',
+          'Ignore this node and never add it to the list',
+          default: []
         o.integer '--min-score',
           "The minimum score required for winning the election (default: #{Tax::EXACT_SCORE})",
           default: Tax::EXACT_SCORE
         o.integer '--max-winners',
           'The maximum amount of election winners the election (default: 1)',
           default: 1
-        o.bool '--force',
-          'Add/remove if if this operation is not possible',
-          default: false
         o.bool '--skip-ping',
           'Don\'t ping back the node when adding it (not recommended)',
           default: false
@@ -161,29 +161,21 @@ Available options:"
     end
 
     def add(host, port, opts)
+      if opts['ignore-node'].include?("#{host}:#{port}")
+        @log.info("#{host}:#{port} won't be added since it's in the --ignore-node list")
+        return
+      end
       unless opts['skip-ping']
         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)
-        raise "#{host}:#{port} already exists in the list" unless opts['force']
-        @log.debug("#{host}:#{port} already exists in the list")
-      else
-        @remotes.add(host, port)
-        @log.info("#{host}:#{port} added to the list, #{@remotes.all.count} total")
-      end
-      @log.debug("There are #{@remotes.all.count} remote nodes in the list")
+      @remotes.add(host, port)
+      @log.info("#{host}:#{port} added to the list, #{@remotes.all.count} total")
     end
 
-    def remove(host, port, opts)
-      if @remotes.exists?(host, port)
-        @remotes.remove(host, port)
-        @log.info("#{host}:#{port} removed from the list")
-      else
-        raise "#{host}:#{port} is not in the list" unless opts['force']
-        @log.debug("#{host}:#{port} is not in the list")
-      end
-      @log.debug("There are #{@remotes.all.count} remote nodes in the list")
+    def remove(host, port, _)
+      @remotes.remove(host, port)
+      @log.info("#{host}:#{port} removed from the list, #{@remotes.all.count} total")
     end
 
     # Returns an array of Zold::Score
@@ -242,7 +234,8 @@ it's recommended to reboot, but I don't do it because of --never-reboot")
         end
         if deep
           json['all'].each do |s|
-            @remotes.add(s['host'], s['port'])
+            add(s['host'], s['port'], opts)
+            @log.info("#{s['host']}:#{s['port']} found at #{r} and added")
           end
         end
         capacity << { host: score.host, port: score.port, count: json['all'].count }
@@ -255,9 +248,9 @@ in #{(Time.now - start).round(2)}s")
       end
       total = @remotes.all.size
       if total.zero?
-        @log.debug("The list of remotes is #{Rainbow('empty').red}, run 'zold remote reset'!")
+        @log.info("The list of remotes is #{Rainbow('empty').red}, run 'zold remote reset'!")
       else
-        @log.debug("There are #{total} known remotes")
+        @log.info("There are #{total} known remotes")
       end
     end
 

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

@@ -44,10 +44,14 @@ module Zold
         sleep(60) unless @opts['routine-immediately']
         cmd = Remote.new(remotes: @remotes, log: @log, farm: @farm)
         args = ['remote', "--network=#{@opts['network']}"]
-        cmd.run(args + ['add', 'b1.zold.io', '80', '--force']) unless @opts['routine-immediately']
+        score = @farm.best[0]
+        args << "--ignore-node=#{score.host}:#{score.port}" if score
+        cmd.run(args + ['add', 'b1.zold.io', '80']) unless @opts['routine-immediately']
         cmd.run(args + ['trim'])
         cmd.run(args + ['select'])
         cmd.run(args + ['update'] + (@opts['never-reboot'] ? [] : ['--reboot']))
+        @log.info("Reconnected, there are #{@remotes.all.count} remote notes: \
+#{@remotes.all.map { |r| "#{r[:host]}:#{r[:port]}" }.join(', ')}")
       end
     end
   end

data/lib/zold/commands/show.rb

@@ -53,7 +53,9 @@ Available options:"
       else
         total = Amount::ZERO
         mine.map { |i| Id.new(i) }.each do |id|
-          total += show(@wallets.find(id), opts)
+          @wallets.find(id) do |w|
+            total += show(w, opts)
+          end
         end
         total
       end

data/lib/zold/commands/taxes.rb

@@ -80,17 +80,23 @@ Available options:"
       when 'show'
         raise 'At least one wallet ID is required' unless mine[1]
         mine[1..-1].each do |id|
-          show(@wallets.find(Id.new(id)), opts)
+          @wallets.find(Id.new(id)) do |w|
+            show(w, opts)
+          end
         end
       when 'debt'
         raise 'At least one wallet ID is required' unless mine[1]
         mine[1..-1].each do |id|
-          debt(@wallets.find(Id.new(id)), opts)
+          @wallets.find(Id.new(id)) do |w|
+            debt(w, opts)
+          end
         end
       when 'pay'
         raise 'At least one wallet ID is required' unless mine[1]
         mine[1..-1].each do |id|
-          pay(@wallets.find(Id.new(id)), opts)
+          @wallets.find(Id.new(id)) do |w|
+            pay(w, opts)
+          end
         end
       else
         @log.info(opts.to_s)

data/lib/zold/copies.rb

@@ -140,8 +140,6 @@ module Zold
       end
     end
 
-    private
-
     def load
       FileUtils.mkdir_p(File.dirname(file))
       FileUtils.touch(file)
@@ -156,6 +154,8 @@ module Zold
       end
     end
 
+    private
+
     def save(list)
       AtomicFile.new(file).write(
         list.map do |r|

data/lib/zold/hungry_wallets.rb

@@ -1,5 +1,25 @@
 # 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 'delegate'
 
 module Zold
@@ -8,7 +28,7 @@ module Zold
     # @todo #280:30min Add to the queue. Once in there, try
     #  to pull it as soon as possible as is described in #280.
     def find(id)
-      super(id)
+      yield super(id)
     end
   end
 end

data/lib/zold/node/async_entrance.rb

@@ -67,14 +67,13 @@ module Zold
         @pool = Concurrent::FixedThreadPool.new(
           AsyncEntrance::THREADS, max_queue: AsyncEntrance::THREADS, fallback_policy: :abort
         )
-        AsyncEntrance::THREADS.times do
+        AsyncEntrance::THREADS.times do |t|
           @pool.post do
+            Thread.current.name = "async-#{t}"
             loop do
-              VerboseThread.new(@log).run(true) do
-                take
-                break if @pool.shuttingdown?
-                sleep Random.rand(100) / 100
-              end
+              VerboseThread.new(@log).run(true) { take }
+              break if @pool.shuttingdown?
+              sleep Random.rand(100) / 100
             end
           end
         end

data/lib/zold/node/entrance.rb

@@ -97,8 +97,9 @@ module Zold
       @mutex.synchronize do
         @history.shift if @history.length >= 16
         @speed.shift if @speed.length >= 64
-        wallet = @wallets.find(id)
-        @history << "#{id}/#{sec}/#{modified.count}/#{wallet.balance.to_zld}/#{wallet.txns.count}t"
+        @wallets.find(id) do |wallet|
+          @history << "#{id}/#{sec}/#{modified.count}/#{wallet.balance.to_zld}/#{wallet.txns.count}t"
+        end
         @speed << sec
       end
       modified

data/lib/zold/node/front.rb

@@ -45,12 +45,15 @@ module Zold
   # Web front
   class Front < Sinatra::Base
     configure do
+      Thread.current.name = 'sinatra'
       set :bind, '0.0.0.0'
       set :suppress_messages, true
       set :start, Time.now
       set :lock, false
       set :show_exceptions, false
       set :server, 'webrick'
+      set :log, nil? # to be injected at node.rb
+      set :trace, nil? # to be injected at node.rb
       set :halt, '' # to be injected at node.rb
       set :dump_errors, false # to be injected at node.rb
       set :version, VERSION # to be injected at node.rb
@@ -59,7 +62,6 @@ module Zold
       set :reboot, false # to be injected at node.rb
       set :home, nil? # to be injected at node.rb
       set :logging, true # to be injected at node.rb
-      set :log, nil? # to be injected at node.rb
       set :address, nil? # to be injected at node.rb
       set :farm, nil? # to be injected at node.rb
       set :metronome, nil? # to be injected at node.rb
@@ -95,15 +97,14 @@ while #{settings.address} is in '#{settings.network}'"
         s = Score.parse_text(header)
         error(400, 'The score is invalid') unless s.valid?
         error(400, 'The score is weak') if s.strength < Score::STRENGTH && !settings.ignore_score_weakness
-        if s.value > 3
-          require_relative '../commands/remote'
-          cmd = Remote.new(remotes: settings.remotes, log: settings.log)
-          cmd.run(['remote', 'add', s.host, s.port.to_s, '--force', "--network=#{settings.network}"])
-          cmd.run(%w[remote trim])
-          cmd.run(%w[remote select])
-        else
-          settings.log.debug("#{request.url}: the score is too weak: #{s}")
+        if settings.address == "#{s.host}:#{s.port}" && !settings.ignore_score_weakness
+          error(400, 'Self-requests are prohibited')
         end
+        require_relative '../commands/remote'
+        cmd = Remote.new(remotes: settings.remotes, log: settings.log)
+        cmd.run(['remote', 'add', s.host, s.port.to_s, "--network=#{settings.network}"])
+        cmd.run(%w[remote trim])
+        cmd.run(%w[remote select])
       end
     end
 
@@ -138,6 +139,11 @@ while #{settings.address} is in '#{settings.network}'"
       score.to_s
     end
 
+    get '/trace' do
+      content_type 'text/plain'
+      settings.trace.to_s
+    end
+
     get '/favicon.ico' do
       if score.value >= 16
         redirect 'https://www.zold.io/images/logo-green.png'
@@ -175,116 +181,141 @@ while #{settings.address} is in '#{settings.network}'"
 
     get %r{/wallet/(?<id>[A-Fa-f0-9]{16})} do
       id = Id.new(params[:id])
-      wallet = settings.wallets.find(id)
-      error 404 unless wallet.exists?
-      content_type 'application/json'
-      {
-        version: settings.version,
-        alias: settings.node_alias,
-        protocol: settings.protocol,
-        id: wallet.id.to_s,
-        score: score.to_h,
-        wallets: settings.wallets.all.count,
-        mtime: wallet.mtime.utc.iso8601,
-        size: File.size(wallet.path),
-        digest: wallet.digest,
-        balance: wallet.balance.to_i,
-        body: AtomicFile.new(wallet.path).read
-      }.to_json
+      settings.wallets.find(id) do |wallet|
+        error 404 unless wallet.exists?
+        content_type 'application/json'
+        {
+          version: settings.version,
+          alias: settings.node_alias,
+          protocol: settings.protocol,
+          id: wallet.id.to_s,
+          score: score.to_h,
+          wallets: settings.wallets.all.count,
+          mtime: wallet.mtime.utc.iso8601,
+          size: File.size(wallet.path),
+          digest: wallet.digest,
+          copies: Copies.new(File.join(settings.copies, id)).all.count,
+          balance: wallet.balance.to_i,
+          body: AtomicFile.new(wallet.path).read
+        }.to_json
+      end
     end
 
     get %r{/wallet/(?<id>[A-Fa-f0-9]{16}).json} do
       id = Id.new(params[:id])
-      wallet = settings.wallets.find(id)
-      error 404 unless wallet.exists?
-      content_type 'application/json'
-      {
-        version: settings.version,
-        alias: settings.node_alias,
-        protocol: settings.protocol,
-        id: wallet.id.to_s,
-        score: score.to_h,
-        wallets: settings.wallets.all.count,
-        key: wallet.key.to_pub,
-        mtime: wallet.mtime.utc.iso8601,
-        digest: wallet.digest,
-        balance: wallet.balance.to_i,
-        txns: wallet.txns.count
-      }.to_json
+      settings.wallets.find(id) do |wallet|
+        error 404 unless wallet.exists?
+        content_type 'application/json'
+        {
+          version: settings.version,
+          alias: settings.node_alias,
+          protocol: settings.protocol,
+          id: wallet.id.to_s,
+          score: score.to_h,
+          wallets: settings.wallets.all.count,
+          key: wallet.key.to_pub,
+          mtime: wallet.mtime.utc.iso8601,
+          digest: wallet.digest,
+          balance: wallet.balance.to_i,
+          txns: wallet.txns.count
+        }.to_json
+      end
     end
 
     get %r{/wallet/(?<id>[A-Fa-f0-9]{16})/balance} do
       id = Id.new(params[:id])
-      wallet = settings.wallets.find(id)
-      error 404 unless wallet.exists?
-      content_type 'text/plain'
-      wallet.balance.to_i.to_s
+      settings.wallets.find(id) do |wallet|
+        error 404 unless wallet.exists?
+        content_type 'text/plain'
+        wallet.balance.to_i.to_s
+      end
     end
 
     get %r{/wallet/(?<id>[A-Fa-f0-9]{16})/key} do
       id = Id.new(params[:id])
-      wallet = settings.wallets.find(id)
-      error 404 unless wallet.exists?
-      content_type 'text/plain'
-      wallet.key.to_pub
+      settings.wallets.find(id) do |wallet|
+        error 404 unless wallet.exists?
+        content_type 'text/plain'
+        wallet.key.to_pub
+      end
     end
 
     get %r{/wallet/(?<id>[A-Fa-f0-9]{16})/mtime} do
       id = Id.new(params[:id])
-      wallet = settings.wallets.find(id)
-      error 404 unless wallet.exists?
-      content_type 'text/plain'
-      wallet.mtime.utc.iso8601.to_s
+      settings.wallets.find(id) do |wallet|
+        error 404 unless wallet.exists?
+        content_type 'text/plain'
+        wallet.mtime.utc.iso8601.to_s
+      end
     end
 
     get %r{/wallet/(?<id>[A-Fa-f0-9]{16})/digest} do
       id = Id.new(params[:id])
-      wallet = settings.wallets.find(id)
-      error 404 unless wallet.exists?
-      content_type 'text/plain'
-      wallet.digest
+      settings.wallets.find(id) do |wallet|
+        error 404 unless wallet.exists?
+        content_type 'text/plain'
+        wallet.digest
+      end
     end
 
     get %r{/wallet/(?<id>[A-Fa-f0-9]{16})\.txt} do
       id = Id.new(params[:id])
-      wallet = settings.wallets.find(id)
-      error 404 unless wallet.exists?
-      content_type 'text/plain'
-      [
-        wallet.network,
-        wallet.protocol,
-        wallet.id.to_s,
-        wallet.key.to_pub,
-        '',
-        wallet.txns.map(&:to_text).join("\n"),
-        '',
-        '--',
-        "Balance: #{wallet.balance.to_zld}",
-        "Transactions: #{wallet.txns.count}",
-        "Wallet size: #{File.size(wallet.path)} bytes",
-        "Modified: #{wallet.mtime.utc.iso8601}",
-        "Digest: #{wallet.digest}"
-      ].join("\n")
+      settings.wallets.find(id) do |wallet|
+        error 404 unless wallet.exists?
+        content_type 'text/plain'
+        [
+          wallet.network,
+          wallet.protocol,
+          wallet.id.to_s,
+          wallet.key.to_pub,
+          '',
+          wallet.txns.map(&:to_text).join("\n"),
+          '',
+          '--',
+          "Balance: #{wallet.balance.to_zld} ZLD (#{wallet.balance.to_i} zents)",
+          "Transactions: #{wallet.txns.count}",
+          "File size: #{File.size(wallet.path)} bytes (#{Copies.new(File.join(settings.copies, id)).all.count} copies)",
+          "Modified: #{wallet.mtime.utc.iso8601}",
+          "Digest: #{wallet.digest}"
+        ].join("\n")
+      end
     end
 
     get %r{/wallet/(?<id>[A-Fa-f0-9]{16})\.bin} do
       id = Id.new(params[:id])
-      wallet = settings.wallets.find(id)
-      error 404 unless wallet.exists?
-      content_type 'text/plain'
-      AtomicFile.new(wallet.path).read
+      settings.wallets.find(id) do |wallet|
+        error 404 unless wallet.exists?
+        content_type 'text/plain'
+        AtomicFile.new(wallet.path).read
+      end
     end
 
     get %r{/wallet/(?<id>[A-Fa-f0-9]{16})/copies} do
       id = Id.new(params[:id])
-      wallet = settings.wallets.find(id)
-      error 404 unless wallet.exists?
-      content_type 'text/plain'
-      Copies.new(File.join(settings.copies, id)).all.map do |c|
-        wallet = Wallet.new(c[:path])
-        "#{c[:name]}: #{c[:score]} #{wallet.balance}/#{wallet.txns.count}t/\
-#{wallet.digest[0, 6]}/#{File.size(c[:path])}b/#{Age.new(File.mtime(c[:path]))}"
-      end.join("\n")
+      settings.wallets.find(id) do |wallet|
+        error 404 unless wallet.exists?
+        content_type 'text/plain'
+        copies = Copies.new(File.join(settings.copies, id))
+        copies.load.map { |c| "#{c[:name]}: #{c[:host]}:#{c[:port]} #{c[:score]} #{c[:time]}" }.join("\n") +
+        "\n\n" +
+        copies.all.map do |c|
+          w = Wallet.new(c[:path])
+          "#{c[:name]}: #{c[:score]} #{w.balance}/#{w.txns.count}t/\
+  #{w.digest[0, 6]}/#{File.size(c[:path])}b/#{Age.new(File.mtime(c[:path]))}"
+        end.join("\n")
+      end
+    end
+
+    get %r{/wallet/(?<id>[A-Fa-f0-9]{16})/copy/(?<name>[0-9]+)} do
+      id = Id.new(params[:id])
+      name = params[:name]
+      settings.wallets.find(id) do |wallet|
+        error 404 unless wallet.exists?
+        copy = Copies.new(File.join(settings.copies, id)).all.find { |c| c[:name] == name }
+        error 404 if copy.nil?
+        content_type 'text/plain'
+        File.read(copy[:path])
+      end
     end
 
     put %r{/wallet/(?<id>[A-Fa-f0-9]{16})/?} do
@@ -331,7 +362,7 @@ while #{settings.address} is in '#{settings.network}'"
     error 400 do
       status 400
       content_type 'text/plain'
-      env['sinatra.error'].message
+      env['sinatra.error'] ? env['sinatra.error'].message : 'Invalid request'
     end
 
     error do