zold 0.23.7 → 0.23.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c510a03d5a3e6a7b5d4df8f7cf1cd90be5bb9ec44cfa8a31215f148d864edcbb
-  data.tar.gz: 42b34d4d44e8d25c67daa9eeb6053fba49bd9bb3bfd811b7686e76a266aefc55
+  metadata.gz: dd1a70efe61838a0cd3e0e4e17ef464d8c6d7791a98d24b5ecbc4ce4a43ef933
+  data.tar.gz: a00d4af1fee0f35b6e32ee8e1f2b0496cc480b61257185a6ac7ff8db5b022207
 SHA512:
-  metadata.gz: 82667cd425fec0f1fd029da8a9c418cb740da96f997a99c99a1ed02863ec995cb279636d3c62370e621ced477a3bca6f73a7407498391a4ffc6940a1dd37498b
-  data.tar.gz: '047049f8723e534ed026eb6a7701b66b6491aa9e7937954d4d49f4fc1788c553131bb5acc70ac68078b59baa8f6f53dffc03fe1e9efe51e1a4d8fda1d5a0ff06'
+  metadata.gz: df4eed8f2f359d92b071bc379189b64461fce53f61f77030da4b19fedfe0cd0fdbf6eebbce84919dc8ba0d55eeb22514da0f6494a94baf919de7dbb10653451b
+  data.tar.gz: 7a95d2dd6f095e221776acb5f249f00d4e8864fba49dc1918e893b9a6bb9545930673bda1f52316d1c0cdb55b5549078777e8534c9f3fc9b2d0db82a96eeb665

data/lib/zold/commands/remote.rb

@@ -96,6 +96,9 @@ Available options:"
         o.bool '--ignore-masters',
           'Don\'t elect master nodes, only edges',
           default: false
+        o.bool '--masters-too',
+          'Give no priviledges to masters, treat them as other nodes',
+          default: false
         o.integer '--min-score',
           "The minimum score required for winning the election (default: #{Tax::EXACT_SCORE})",
           default: Tax::EXACT_SCORE
@@ -252,7 +255,7 @@ Available options:"
       all = @remotes.all
       all.each do |r|
         next if r[:errors] <= opts['tolerate']
-        @remotes.remove(r[:host], r[:port])
+        @remotes.remove(r[:host], r[:port]) if !opts['masters-too'] || !r[:master]
         @log.info("#{r[:host]}:#{r[:port]} removed because of #{r[:errors]} errors (over #{opts['tolerate']})")
       end
       @log.info("The list of #{all.count} remotes trimmed, #{@remotes.all.count} nodes left there")
@@ -344,7 +347,7 @@ it's recommended to reboot, but I don't do it because of --never-reboot")
     def select(opts)
       selected = @remotes.all.sort_by { |r| r[:score] }.reverse.first(opts['max-nodes'])
       (@remotes.all - selected).each do |r|
-        @remotes.remove(r[:host], r[:port])
+        @remotes.remove(r[:host], r[:port]) if !opts['masters-too'] || !r[:master]
         @log.info("Remote #{r[:host]}:#{r[:port]}/#{r[:score]} removed from the list, #{@remotes.all.count} left")
       end
       @log.info("#{opts['max-nodes']} remote nodes left in the list")

data/lib/zold/node/farm.rb

@@ -153,7 +153,7 @@ at #{host}:#{port}, strength is #{@strength}")
     def cleanup(host, port, threads)
       scores = load
       before = scores.map(&:value).max.to_i
-      save(threads, [Score.new(host: host, port: port, invoice: @invoice, strength: @strength)])
+      save(host, port, threads, [Score.new(host: host, port: port, invoice: @invoice, strength: @strength)])
       scores = load
       free = scores.reject { |s| @threads.exists?(s.to_mnemo) }
       @pipeline << free[0] if @pipeline.size.zero? && !free.empty?
@@ -182,16 +182,19 @@ at #{host}:#{port}, strength is #{@strength}")
       Thread.current.thread_variable_set(:start, Time.now.utc.iso8601)
       score = @farmer.up(s)
       @log.debug("New score discovered: #{score}") if @strength > 4
-      save(threads, [score])
+      save(host, port, threads, [score])
       cleanup(host, port, threads)
     end
 
-    def save(threads, list = [])
+    def save(host, port, threads, list = [])
       scores = load + list
       period = @lifetime / [threads, 1].max
       body = scores.select(&:valid?)
         .reject(&:expired?)
         .reject { |s| s.strength < @strength }
+        .select { |s| s.host == host }
+        .select { |s| s.port == port }
+        .select { |s| s.invoice == @invoice }
         .sort_by(&:value)
         .reverse
         .uniq(&:time)

data/lib/zold/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.23.7
+  version: 0.23.8
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-16 00:00:00.000000000 Z
+date: 2019-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace
@@ -753,7 +753,7 @@ licenses:
 - MIT
 metadata: {}
 post_install_message: |-
-  Thanks for installing Zold 0.23.7!
+  Thanks for installing Zold 0.23.8!
     Study our White Paper: https://papers.zold.io/wp.pdf
     Read our blog posts: https://blog.zold.io
     Try ZLD online wallet at: https://wts.zold.io