zold 0.16.18 → 0.16.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de86dbcab88573c76088a862afd47563bebee0d62df73b695bdae79dc2e47778
-  data.tar.gz: 76f9b1a004ff1ef24acf833626b128bff9ac7663e16bc10c7a476e4667b349fc
+  metadata.gz: f5c735ab0c917e4b346f598206c82a224a81caf5e6e3629d73203cb918bd6200
+  data.tar.gz: 41f2241f736aab555d0fd2a32481814c2142121339488a7e6269506a398204d2
 SHA512:
-  metadata.gz: 68cf2ad85d6eeaf93cb9d32d1e84f8c25c96f70826ca4dc9e68140e89c32bd9d9e584fcc94e9ccc7fbfcaec0e1e9b2c3c2a51313f717af97da577bf517ae7ade
-  data.tar.gz: 2c45d5fee9bf53f9e2e09e9e961c3004755574fd23a5840c93767b15beba9b3c236464fd299b70b39b846a3126b4ce66792bb29f608158f5af69fbc94ae3bf9c
+  metadata.gz: 8b477ea12a0c08aff12a68c5f07af44e13ebd131c0c156b9cde6fcf62da81fe21ffab32c3dc13483ec330a0f8a01ad8efcb67bc8612b772ea812bff5fe5b2a8a
+  data.tar.gz: 2eed2bff0ee50b4136088e2ad3a8b7c1ca80cffe02115f25891eeb6d45129bc590387134afbe22ed3bce1bf8c944c507aff07aa4708d5e7395b5b90998c2d045

data/fixtures/scripts/redeploy-on-upgrade.sh

@@ -7,7 +7,7 @@ function start_node {
   zold node $3 --nohup --nohup-command='touch restarted' --nohup-log=log --nohup-max-cycles=0 --nohup-log-truncate=10240 \
     --expose-version=$2 --save-pid=pid --routine-immediately \
     --verbose --trace --invoice=REDEPLOY@ffffffffffffffff \
-    --host=localhost --port=$1 --bind-port=$1 --threads=0 > /dev/null 2>&1
+    --host=localhost --port=$1 --bind-port=$1 --threads=1 --strength=20 > /dev/null 2>&1
   wait_for_port $1
   cat pid
   cd ..
@@ -18,12 +18,19 @@ primary=$(start_node ${high} 9.9.9 --standalone)
 
 low=$(reserve_port)
 secondary=$(start_node ${low} 1.1.1)
+
+zold remote clean
 zold remote add localhost ${high} --home=${low} --skip-ping
 
 trap "halt_nodes ${high}" EXIT
 
 wait_for_file ${low}/restarted
 
+if [ `ps ax | grep zold | grep "${low}"` -eq '' ]; then
+  echo "The score finder process is still there, it's a bug"
+  exit -1
+fi
+
 echo "High node logs (port ${high}):"
 cat ${high}/log
 echo "Low node logs (port ${low}):"

data/lib/zold/commands/list.rb

@@ -36,7 +36,7 @@ module Zold
     end
 
     def run(_ = [])
-      @wallets.all.each do |id|
+      @wallets.all.sort.each do |id|
         @wallets.find(id) do |wallet|
           msg = wallet.mnemo
           msg += " (net:#{wallet.network})" if wallet.network != Wallet::MAIN_NETWORK

data/lib/zold/commands/node.rb

@@ -168,12 +168,8 @@ module Zold
       Front.set(:logger, @log)
       Front.set(:trace, @log)
       Front.set(:nohup_log, opts['nohup-log']) if opts['nohup-log']
-      Front.set(:version, opts['expose-version'])
       Front.set(:protocol, Zold::PROTOCOL)
       Front.set(:logging, @log.debug?)
-      Front.set(:halt, opts['halt-code'])
-      Front.set(:disable_push, opts['disable-push'])
-      Front.set(:disable_fetch, opts['disable-fetch'])
       home = File.expand_path(opts['home'])
       Front.set(:home, home)
       @log.info("Time: #{Time.now.utc.iso8601}")
@@ -197,16 +193,14 @@ module Zold
         Zold::Remote.new(remotes: @remotes).run(['remote', 'remove', host, port.to_s])
         @log.info("Removed current node (#{address}) from list of remotes")
       end
-      Front.set(:ignore_score_weakness, opts['ignore-score-weakness'])
-      Front.set(:network, opts['network'])
       Front.set(:wallets, @wallets)
       Front.set(:remotes, @remotes)
       Front.set(:copies, @copies)
       Front.set(:address, address)
       Front.set(:root, home)
+      Front.set(:opts, opts)
       Front.set(:dump_errors, opts['dump-errors'])
       Front.set(:port, opts['bind-port'])
-      Front.set(:reboot, !opts['never-reboot'])
       node_alias = opts[:alias] || address
       unless node_alias.eql?(address) || node_alias =~ /^[A-Za-z0-9]{4,16}$/
         raise "Alias should be a 4 to 16 char long alphanumeric string: #{node_alias}"

data/lib/zold/commands/push.rb

@@ -104,8 +104,10 @@ total score for #{id} is #{total}")
         r.assert_valid_score(score)
         r.assert_score_ownership(score)
         r.assert_score_strength(score) unless opts['ignore-score-weakness']
-        @log.info("#{r} accepted #{wallet.mnemo} in #{Age.new(start, limit: 4)}: \
+        if @log.info?
+          @log.info("#{r} accepted #{wallet.mnemo} in #{Age.new(start, limit: 4)}: \
 #{Rainbow(score.value).green} (#{json['version']})")
+        end
         score.value
       end
     end

data/lib/zold/commands/remote.rb

@@ -87,6 +87,9 @@ Available options:"
         o.array '--ignore-node',
           'Ignore this node and never add it to the list',
           default: []
+        o.bool '--ignore-if-exists',
+          'Ignore the node while adding if it already exists in the list',
+          default: false
         o.integer '--min-score',
           "The minimum score required for winning the election (default: #{Tax::EXACT_SCORE})",
           default: Tax::EXACT_SCORE
@@ -179,6 +182,10 @@ Available options:"
         @log.info("#{host}:#{port} won't be added since it's in the --ignore-node list")
         return
       end
+      if opts['ignore-if-exists'] && @remotes.exists?(host, port)
+        @log.info("#{host}:#{port} already exists, won't add because of --ignore-if-exists")
+        return
+      end
       unless opts['skip-ping']
         res = Http.new(uri: "http://#{host}:#{port}/version", network: opts['network']).get
         raise "The node #{host}:#{port} is not responding, #{res.code}:#{res.message}" unless res.code == '200'

data/lib/zold/node/front.rb

@@ -55,27 +55,23 @@ module Zold
       set :lock, false
       set :show_exceptions, false
       set :server, :thin
-      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 :opts, nil # to be injected at node.rb
+      set :log, nil # to be injected at node.rb
+      set :trace, nil # 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
       set :protocol, PROTOCOL # to be injected at node.rb
-      set :ignore_score_weakness, false # to be injected at node.rb
-      set :reboot, false # to be injected at node.rb
       set :nohup_log, false # to be injected at node.rb
-      set :home, nil? # 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 :logger, 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
-      set :entrance, 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
-      set :node_alias, nil? # to be injected at node.rb
+      set :logger, 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
+      set :entrance, nil # 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
+      set :node_alias, nil # to be injected at node.rb
       set :zache, Zache.new
     end
     use Rack::Deflater
@@ -84,14 +80,14 @@ module Zold
       Thread.current.thread_variable_set(:uri, request.url)
       Thread.current.thread_variable_set(:ip, request.ip)
       @start = Time.now
-      if !settings.halt.empty? && params[:halt] && params[:halt] == settings.halt
+      if !settings.opts['halt-code'].empty? && params[:halt] && params[:halt] == settings.opts['halt-code']
         settings.log.error('Halt signal received, shutting the front end down...')
         Front.stop!
       end
       check_header(Http::NETWORK_HEADER) do |header|
-        if header != settings.network
+        if header != settings.opts['network']
           error(400, "Network name mismatch at #{request.url}, #{request.ip} is in '#{header}', \
-while #{settings.address} is in '#{settings.network}'")
+while #{settings.address} is in '#{settings.opts['network']}'")
         end
       end
       check_header(Http::PROTOCOL_HEADER) do |header|
@@ -100,19 +96,23 @@ while #{settings.address} is in '#{settings.network}'")
         end
       end
       check_header(Http::SCORE_HEADER) do |header|
-        settings.log.debug("#{request.url}: we are in standalone mode, won't update remotes") if all_remotes.empty?
-        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 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)
-        begin
-          cmd.run(['remote', 'add', s.host, s.port.to_s, "--network=#{settings.network}"])
-        rescue StandardError => e
-          error(400, e.message)
+        if settings.opts['standalone']
+          settings.log.debug("#{request.url}: we are in standalone mode, won't update remotes")
+        else
+          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.opts['ignore-score-weakness']
+          if settings.address == "#{s.host}:#{s.port}" && !settings.opts['ignore-score-weakness']
+            error(400, 'Self-requests are prohibited')
+          end
+          require_relative '../commands/remote'
+          begin
+            Remote.new(remotes: settings.remotes, log: settings.log).run(
+              ['remote', 'add', s.host, s.port.to_s, "--network=#{settings.opts['network']}", '--ignore-if-exists']
+            )
+          rescue StandardError => e
+            error(400, e.message)
+          end
         end
       end
     end
@@ -121,7 +121,7 @@ while #{settings.address} is in '#{settings.network}'")
     #  Currently there are no tests at all that would verify the headers.
     after do
       headers['Cache-Control'] = 'no-cache'
-      headers['X-Zold-Version'] = settings.version
+      headers['X-Zold-Version'] = settings.opts['expose-version']
       headers[Http::PROTOCOL_HEADER] = settings.protocol.to_s
       headers['Access-Control-Allow-Origin'] = '*'
       headers[Http::SCORE_HEADER] = score.reduced(16).to_s
@@ -142,7 +142,7 @@ in #{Age.new(@start, limit: 1)}")
 
     get '/version' do
       content_type('text/plain')
-      settings.version
+      settings.opts['expose-version']
     end
 
     get '/protocol' do
@@ -186,9 +186,9 @@ in #{Age.new(@start, limit: 1)}")
     get '/' do
       content_type('application/json')
       JSON.pretty_generate(
-        version: settings.version,
+        version: settings.opts['expose-version'],
         alias: settings.node_alias,
-        network: settings.network,
+        network: settings.opts['network'],
         protocol: settings.protocol,
         score: score.to_h,
         pid: Process.pid,
@@ -218,12 +218,12 @@ in #{Age.new(@start, limit: 1)}")
     end
 
     get %r{/wallet/(?<id>[A-Fa-f0-9]{16})} do
-      error(404, 'FETCH is disabled with --disable-fetch') if settings.disable_fetch
+      error(404, 'FETCH is disabled with --disable-fetch') if settings.opts['disable-fetch']
       id = Id.new(params[:id])
       copy_of(id) do |wallet|
         content_type('application/json')
         JSON.pretty_generate(
-          version: settings.version,
+          version: settings.opts['expose-version'],
           alias: settings.node_alias,
           protocol: settings.protocol,
           id: wallet.id.to_s,
@@ -240,12 +240,12 @@ in #{Age.new(@start, limit: 1)}")
     end
 
     get %r{/wallet/(?<id>[A-Fa-f0-9]{16}).json} do
-      error(404, 'FETCH is disabled with --disable-fetch') if settings.disable_fetch
+      error(404, 'FETCH is disabled with --disable-fetch') if settings.opts['disable-fetch']
       id = Id.new(params[:id])
       copy_of(id) do |wallet|
         content_type('application/json')
         JSON.pretty_generate(
-          version: settings.version,
+          version: settings.opts['expose-version'],
           alias: settings.node_alias,
           protocol: settings.protocol,
           id: wallet.id.to_s,
@@ -261,7 +261,7 @@ in #{Age.new(@start, limit: 1)}")
     end
 
     get %r{/wallet/(?<id>[A-Fa-f0-9]{16})/balance} do
-      error(404, 'FETCH is disabled with --disable-fetch') if settings.disable_fetch
+      error(404, 'FETCH is disabled with --disable-fetch') if settings.opts['disable-fetch']
       id = Id.new(params[:id])
       copy_of(id) do |wallet|
         content_type 'text/plain'
@@ -270,7 +270,7 @@ in #{Age.new(@start, limit: 1)}")
     end
 
     get %r{/wallet/(?<id>[A-Fa-f0-9]{16})/key} do
-      error(404, 'FETCH is disabled with --disable-fetch') if settings.disable_fetch
+      error(404, 'FETCH is disabled with --disable-fetch') if settings.opts['disable-fetch']
       id = Id.new(params[:id])
       copy_of(id) do |wallet|
         content_type 'text/plain'
@@ -279,7 +279,7 @@ in #{Age.new(@start, limit: 1)}")
     end
 
     get %r{/wallet/(?<id>[A-Fa-f0-9]{16})/mtime} do
-      error(404, 'FETCH is disabled with --disable-fetch') if settings.disable_fetch
+      error(404, 'FETCH is disabled with --disable-fetch') if settings.opts['disable-fetch']
       id = Id.new(params[:id])
       copy_of(id) do |wallet|
         content_type 'text/plain'
@@ -288,7 +288,7 @@ in #{Age.new(@start, limit: 1)}")
     end
 
     get %r{/wallet/(?<id>[A-Fa-f0-9]{16})/digest} do
-      error(404, 'FETCH is disabled with --disable-fetch') if settings.disable_fetch
+      error(404, 'FETCH is disabled with --disable-fetch') if settings.opts['disable-fetch']
       id = Id.new(params[:id])
       copy_of(id) do |wallet|
         content_type 'text/plain'
@@ -297,7 +297,7 @@ in #{Age.new(@start, limit: 1)}")
     end
 
     get %r{/wallet/(?<id>[A-Fa-f0-9]{16})\.txt} do
-      error(404, 'FETCH is disabled with --disable-fetch') if settings.disable_fetch
+      error(404, 'FETCH is disabled with --disable-fetch') if settings.opts['disable-fetch']
       id = Id.new(params[:id])
       copy_of(id) do |wallet|
         content_type 'text/plain'
@@ -321,7 +321,7 @@ in #{Age.new(@start, limit: 1)}")
     end
 
     get %r{/wallet/(?<id>[A-Fa-f0-9]{16})\.bin} do
-      error(404, 'FETCH is disabled with --disable-fetch') if settings.disable_fetch
+      error(404, 'FETCH is disabled with --disable-fetch') if settings.opts['disable-fetch']
       id = Id.new(params[:id])
       copy_of(id) do |wallet|
         content_type 'text/plain'
@@ -330,7 +330,7 @@ in #{Age.new(@start, limit: 1)}")
     end
 
     get %r{/wallet/(?<id>[A-Fa-f0-9]{16})/copies} do
-      error(404, 'FETCH is disabled with --disable-fetch') if settings.disable_fetch
+      error(404, 'FETCH is disabled with --disable-fetch') if settings.opts['disable-fetch']
       id = Id.new(params[:id])
       copy_of(id) do
         content_type 'text/plain'
@@ -348,7 +348,7 @@ in #{Age.new(@start, limit: 1)}")
     end
 
     get %r{/wallet/(?<id>[A-Fa-f0-9]{16})/copy/(?<name>[0-9]+)} do
-      error(404, 'FETCH is disabled with --disable-fetch') if settings.disable_fetch
+      error(404, 'FETCH is disabled with --disable-fetch') if settings.opts['disable-fetch']
       id = Id.new(params[:id])
       name = params[:name]
       copy_of(id) do
@@ -360,7 +360,7 @@ in #{Age.new(@start, limit: 1)}")
     end
 
     put %r{/wallet/(?<id>[A-Fa-f0-9]{16})/?} do
-      error(404, 'PUSH is disabled with --disable-push') if settings.disable_fetch
+      error(404, 'PUSH is disabled with --disable-push') if settings.opts['disable-fetch']
       request.body.rewind
       modified = settings.entrance.push(Id.new(params[:id]), request.body.read.to_s)
       if modified.empty?
@@ -368,7 +368,7 @@ in #{Age.new(@start, limit: 1)}")
         return
       end
       JSON.pretty_generate(
-        version: settings.version,
+        version: settings.opts['expose-version'],
         alias: settings.node_alias,
         score: score.to_h,
         wallets: total_wallets
@@ -378,7 +378,7 @@ in #{Age.new(@start, limit: 1)}")
     get '/remotes' do
       content_type('application/json')
       JSON.pretty_generate(
-        version: settings.version,
+        version: settings.opts['expose-version'],
         alias: settings.node_alias,
         score: score.to_h,
         all: all_remotes,
@@ -450,18 +450,18 @@ in #{Age.new(@start, limit: 1)}")
     #  takes a lot of time (when the amount of wallets is big, like 40K). However,
     #  we must find a way to count them somehow faster.
     def total_wallets
-      return 256 if settings.network == Wallet::MAIN_NETWORK
+      return 256 if settings.opts['network'] == Wallet::MAIN_NETWORK
       settings.wallets.all.count
     end
 
     def all_remotes
-      settings.zache.get(:remotes, lifetime: settings.network == Wallet::MAIN_NETWORK ? 60 : 0) do
+      settings.zache.get(:remotes, lifetime: settings.opts['network'] == Wallet::MAIN_NETWORK ? 60 : 0) do
         settings.remotes.all
       end
     end
 
     def processes_count
-      settings.zache.get(:processes, lifetime: settings.network == Wallet::MAIN_NETWORK ? 60 : 0) do
+      settings.zache.get(:processes, lifetime: settings.opts['network'] == Wallet::MAIN_NETWORK ? 60 : 0) do
         processes.count
       end
     end
@@ -471,7 +471,7 @@ in #{Age.new(@start, limit: 1)}")
     end
 
     def score
-      settings.zache.get(:score, lifetime: settings.network == Wallet::MAIN_NETWORK ? 60 : 0) do
+      settings.zache.get(:score, lifetime: settings.opts['network'] == Wallet::MAIN_NETWORK ? 60 : 0) do
         b = settings.farm.best
         raise 'Score is empty, there is something wrong with the Farm!' if b.empty?
         b[0]

data/lib/zold/version.rb

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

data/test/node/fake_node.rb

@@ -65,7 +65,7 @@ class FakeNode
         uri = "http://localhost:#{port}/"
         attempt = 0
         loop do
-          ping = Zold::Http.new(uri: uri, network: Zold::Front.network).get
+          ping = Zold::Http.new(uri: uri).get
           break unless ping.code == '599' && node.alive?
           @log.debug("Waiting for #{uri} (attempt no.#{attempt}): ##{ping.code}...")
           sleep 0.5

data/test/node/test_front.rb

@@ -265,11 +265,11 @@ class FrontTest < Zold::Test
 
   def test_headers_are_being_set_correctly
     Time.stub :now, Time.at(0) do
-      FakeNode.new(log: test_log).run(['--no-metronome', '--threads=0', '--ignore-score-weakness']) do |port|
+      FakeNode.new(log: test_log).run(['--expose-version=9.9.9', '--no-metronome', '--threads=0']) do |port|
         response = Zold::Http.new(uri: URI("http://localhost:#{port}/")).get
         assert_equal('no-cache', response.header['Cache-Control'])
         assert_equal('close', response.header['Connection'])
-        assert_equal(app.settings.version, response.header['X-Zold-Version'])
+        assert_equal('9.9.9', response.header['X-Zold-Version'])
         assert_equal(app.settings.protocol.to_s, response.header[Zold::Http::PROTOCOL_HEADER])
         assert_equal('*', response.header['Access-Control-Allow-Origin'])
         assert(response.header['X-Zold-Milliseconds'])

data/test/test_zold.rb

@@ -34,8 +34,7 @@ require_relative '../lib/zold/age'
 # License:: MIT
 class TestZold < Zold::Test
   Dir.new('fixtures/scripts').select { |f| f =~ /\.sh$/ && !f.start_with?('_') }.each do |f|
-    # next unless f == 'push-and-pull.sh'
-    define_method("test_script_#{f.gsub(/[^a-z]/, '_')}") do
+    define_method("test_#{f.gsub(/\.sh$/, '').gsub(/[^a-z]/, '_')}") do
       start = Time.now
       test_log.debug("\n\n#{f} running...")
       Dir.mktmpdir do |dir|

data/zold.gemspec

@@ -75,7 +75,7 @@ and suggests a different architecture for digital wallet maintenance.'
   s.add_runtime_dependency 'threads', '0.3.0'
   s.add_runtime_dependency 'usagewatch_ext', '0.2.1'
   s.add_runtime_dependency 'xcop', '0.6'
-  s.add_runtime_dependency 'zache', '0.3.0'
+  s.add_runtime_dependency 'zache', '0.3.1'
   s.add_runtime_dependency 'zold-score', '0.2.0'
   s.add_development_dependency 'codecov', '0.1.13'
   s.add_development_dependency 'minitest', '5.11.3'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.16.18
+  version: 0.16.19
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-09 00:00:00.000000000 Z
+date: 2018-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace
@@ -310,14 +310,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: zold-score
   requirement: !ruby/object:Gem::Requirement