zold 0.21.4 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97e75811a1329436f6840794104457cfcc6cf123144fd5a248db333fec67e8f7
-  data.tar.gz: a7ffabc0edb17a8e59c588ed390c9efbd4f34483631178f995e33dd35c6a2539
+  metadata.gz: 396a65bbca7258f8feecc54b1474e49805316f4088bbc7a9a6f1e62ff5a33ac8
+  data.tar.gz: 5172b79f8b015f94ad90a4453e110778d7f21a75b2e6643a77e009ecb8244987
 SHA512:
-  metadata.gz: 12541b87e91a1597365b86e65a9eafe192c5362b492f54d16c24e244cf667a86168e63991f397cc3af791596e5ebaadf35aea64cb54cf042803768bdec5a5854
-  data.tar.gz: 9eb0728e374ff5c74e3db2992bf8d3bbcf3644deaa626df556f7a6fe1bcfdce9012d86e1f6a4280ee36b3ad6a4ff84e2ad2d922887b999dacb05a74d9d78cc13
+  metadata.gz: f2dfba67609c3021e6f7504a7fbd077d45388f4aad4e0aeca8475f624ee7fa37df8d262efad99250b304d6169ed735e8de739e766869d91fa601be080744db92
+  data.tar.gz: a27154e642518f971672bc210aeeb81c5291a307c9ecc04daf1a7e781637033fe25dd1f343994ca1a696bf2c0b43939e1210b1f4c3d6a11aee934c2b9efce2f4

data/.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - 2.5.1
+  - 2.6.0
 cache: bundler
 branches:
   only:

data/INSTALL.md

@@ -18,17 +18,29 @@ It is recommended to have at least 2 CPUs and 2 Gb RAM.
 
 ## Debian 9.4
 
+As a `root` user:
+
 ```bash
 $ sudo apt update -y
 $ sudo apt install -y ruby-dev rubygems zlib1g-dev libssl-dev make build-essential libcurl4-openssl-dev
+$ gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
+$ curl -sSL https://get.rvm.io | bash -s stable
+$ source /etc/profile.d/rvm.sh
+$ rvm install --default 2.5.1
 $ gem install --no-ri --no-rdoc zold
 ```
 
 ## Ubuntu 16.04
 
+As a `root` user:
+
 ```bash
 $ sudo apt-get update -y
-$ sudo apt-get install -y ruby-dev rubygems zlib1g-dev libssl-dev build-essential libcurl4-openssl-dev
+$ sudo apt-get install -y curl ruby-dev rubygems zlib1g-dev libssl-dev build-essential libcurl4-openssl-dev
+$ gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
+$ curl -sSL https://get.rvm.io | bash -s stable
+$ source /etc/profile.d/rvm.sh
+$ rvm install --default 2.5.1
 $ gem install --no-ri --no-rdoc zold
 ```
 
@@ -64,7 +76,7 @@ $ sudo yum install zlib-devel gcc gcc-c++ ruby-devel rubygems ruby curl-devel
 $ gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
 $ curl -sSL https://get.rvm.io | bash -s stable
 $ source /etc/profile.d/rvm.sh
-$ rvm install 2.5.1
+$ rvm install --default 2.5.1
 $ gem install --no-ri --no-rdoc zold
 ```
 
@@ -75,7 +87,7 @@ $ sudo yum install zlib-devel gcc gcc-c++ ruby-devel rubygems ruby libcurl4-open
 $ gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
 $ curl -sSL https://get.rvm.io | bash -s stable
 $ source $HOME/.rvm/scripts/rvm
-$ rvm install 2.5.1
+$ rvm install --default 2.5.1
 $ gem install --no-ri --no-rdoc zold
 ```
 

data/lib/zold/commands/fetch.rb

@@ -87,6 +87,9 @@ Available options:"
         o.integer '--threads',
           'How many threads to use for fetching wallets (default: 1)',
           default: 1
+        o.integer '--retry',
+          'How many times to retry each node before reporting a failure (default: 2)',
+          default: 2
         o.bool '--help', 'Print instructions'
       end
       mine = Args.new(opts, @log).take || return
@@ -133,48 +136,64 @@ run 'zold remote update' or use --tolerate-quorum=1"
     end
 
     def fetch_one(id, r, cps, opts)
-      start = Time.now
       if opts['ignore-node'].include?(r.to_s)
         @log.debug("#{r} ignored because of --ignore-node")
         return 0
       end
-      uri = "/wallet/#{id}"
-      head = r.http(uri).get
-      r.assert_code(200, head)
-      json = JsonPage.new(head.body, uri).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']
-      copy = nil
-      cps.all.each do |c|
-        next unless json['digest'] == OpenSSL::Digest::SHA256.file(c[:path]).hexdigest &&
-          json['size'] == File.size(c[:path])
-        copy = cps.add(IO.read(c[:path]), score.host, score.port, score.value, master: r.master?)
-        @log.debug("No need to fetch #{id} from #{r}, it's the same content as copy ##{copy}")
-        break
-      end
-      if copy.nil?
-        Tempfile.open(['', Wallet::EXT]) do |f|
-          r.http(uri + '.bin').get_file(f)
-          wallet = Wallet.new(f.path)
-          wallet.refurbish
-          if wallet.protocol != Zold::PROTOCOL
-            raise "Protocol #{wallet.protocol} doesn't match #{Zold::PROTOCOL} in #{id}"
-          end
-          if wallet.network != opts['network']
-            raise "The wallet #{id} is in network '#{wallet.network}', while we are in '#{opts['network']}'"
-          end
-          if wallet.balance.negative? && !wallet.root?
-            raise "The balance of #{id} is #{wallet.balance} and it's not a root wallet"
+      start = Time.now
+      read_one(id, r, opts) do |json, score|
+        r.assert_valid_score(score)
+        r.assert_score_ownership(score)
+        r.assert_score_strength(score) unless opts['ignore-score-weakness']
+        copy = nil
+        cps.all.each do |c|
+          next unless json['digest'] == OpenSSL::Digest::SHA256.file(c[:path]).hexdigest &&
+            json['size'] == File.size(c[:path])
+          copy = cps.add(IO.read(c[:path]), score.host, score.port, score.value, master: r.master?)
+          @log.debug("No need to fetch #{id} from #{r}, it's the same content as copy ##{copy}")
+          break
+        end
+        if copy.nil?
+          Tempfile.open(['', Wallet::EXT]) do |f|
+            r.http("/wallet/#{id}.bin").get_file(f)
+            wallet = Wallet.new(f.path)
+            wallet.refurbish
+            if wallet.protocol != Zold::PROTOCOL
+              raise "Protocol #{wallet.protocol} doesn't match #{Zold::PROTOCOL} in #{id}"
+            end
+            if wallet.network != opts['network']
+              raise "The wallet #{id} is in network '#{wallet.network}', while we are in '#{opts['network']}'"
+            end
+            if wallet.balance.negative? && !wallet.root?
+              raise "The balance of #{id} is #{wallet.balance} and it's not a root wallet"
+            end
+            copy = cps.add(IO.read(f), score.host, score.port, score.value, master: r.master?)
+            @log.info("#{r} returned #{wallet.mnemo} #{Age.new(json['mtime'])}/#{json['copies']}c \
+  as copy ##{copy}/#{cps.all.count} in #{Age.new(start, limit: 4)}: \
+  #{Rainbow(score.value).green} (#{json['version']})")
           end
-          copy = cps.add(IO.read(f), score.host, score.port, score.value, master: r.master?)
-          @log.info("#{r} returned #{wallet.mnemo} #{Age.new(json['mtime'])}/#{json['copies']}c \
-as copy ##{copy}/#{cps.all.count} in #{Age.new(start, limit: 4)}: \
-#{Rainbow(score.value).green} (#{json['version']})")
         end
+        score.value
+      end
+    end
+
+    def read_one(id, r, opts)
+      attempt = 0
+      begin
+        uri = "/wallet/#{id}"
+        head = r.http(uri).get
+        r.assert_code(200, head)
+        json = JsonPage.new(head.body, uri).to_hash
+        score = Score.parse_json(json['score'])
+        yield json, score
+      rescue JsonPage::CantParse, Score::CantParse, RemoteNode::CantAssert => e
+        attempt += 1
+        if attempt < opts['retry']
+          @log.error("#{r} failed to fetch #{id}, trying again (attempt no.#{attempt}): #{e.message}")
+          retry
+        end
+        raise e
       end
-      score.value
     end
 
     def digest(json)

data/lib/zold/commands/push.rb

@@ -78,6 +78,9 @@ Available options:"
         o.integer '--threads',
           'How many threads to use for pushing wallets (default: 1)',
           default: 1
+        o.integer '--retry',
+          'How many times to retry each node before reporting a failure (default: 2)',
+          default: 2
         o.bool '--help', 'Print instructions'
       end
       mine = Args.new(opts, @log).take || return
@@ -127,27 +130,41 @@ out of #{nodes.value} in #{Age.new(start)}, total score for #{id} is #{total.val
         return 0
       end
       start = Time.now
-      uri = "/wallet/#{id}"
-      response = Tempfile.open do |f|
-        @wallets.acq(id) { |w| FileUtils.copy_file(w.path, f.path) }
-        r.http(uri).put(f)
+      read_one(id, r, opts) do |json, score|
+        r.assert_valid_score(score)
+        r.assert_score_ownership(score)
+        r.assert_score_strength(score) unless opts['ignore-score-weakness']
+        if @log.info?
+          @log.info("#{r} accepted #{@wallets.acq(id, &:mnemo)} in #{Age.new(start, limit: 4)}: \
+  #{Rainbow(score.value).green} (#{json['version']})")
+        end
+        score.value
       end
-      @wallets.acq(id) do |wallet|
+    end
+
+    def read_one(id, r, opts)
+      start = Time.now
+      uri = "/wallet/#{id}"
+      begin
+        response = Tempfile.open do |f|
+          @wallets.acq(id) { |w| FileUtils.copy_file(w.path, f.path) }
+          r.http(uri).put(f)
+        end
         if response.status == 304
-          @log.info("#{r}: same version of #{wallet.mnemo} there, in #{Age.new(start, limit: 0.5)}")
+          @log.info("#{r}: same version of #{@wallets.acq(id, &:mnemo)} there, in #{Age.new(start, limit: 0.5)}")
           return 0
         end
         r.assert_code(200, response)
         json = JsonPage.new(response.body, uri).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']
-        if @log.info?
-          @log.info("#{r} accepted #{wallet.mnemo} in #{Age.new(start, limit: 4)}: \
-#{Rainbow(score.value).green} (#{json['version']})")
+        yield json, score
+      rescue JsonPage::CantParse, Score::CantParse, RemoteNode::CantAssert => e
+        attempt += 1
+        if attempt < opts['retry']
+          @log.error("#{r} failed to push #{id}, trying again (attempt no.#{attempt}): #{e.message}")
+          retry
         end
-        score.value
+        raise e
       end
     end
   end

data/lib/zold/commands/remote.rb

@@ -93,12 +93,18 @@ Available options:"
         o.bool '--ignore-if-exists',
           'Ignore the node while adding if it already exists in the list',
           default: false
+        o.bool '--ignore-masters',
+          'Don\'t elect master nodes, only edges',
+          default: false
         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.integer '--retry',
+          'How many times to retry each node before reporting a failure (default: 2)',
+          default: 2
         o.bool '--skip-ping',
           'Don\'t ping back the node when adding it (not recommended)',
           default: false
@@ -227,6 +233,10 @@ Available options:"
         r.assert_score_ownership(score)
         r.assert_score_strength(score) unless opts['ignore-score-weakness']
         r.assert_score_value(score, opts['min-score']) unless opts['ignore-score-value']
+        if r.master? && opts['--ignore-masters']
+          @log.debug("#{r} ignored, it's a master node")
+          next
+        end
         scores << score
       end
       scores = scores.sample(opts['max-winners'])
@@ -254,41 +264,38 @@ Available options:"
       opts['depth'].times do |cycle|
         @remotes.iterate(@log, farm: @farm) do |r|
           start = Time.now
-          uri = '/remotes'
-          res = r.http(uri).get
-          r.assert_code(200, res)
-          json = JsonPage.new(res.body, uri).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']
-          @remotes.rescore(score.host, score.port, score.value)
-          if Semantic::Version.new(VERSION) < Semantic::Version.new(json['version'])
-            if opts['reboot']
-              @log.info("#{r}: their version #{json['version']} is higher than mine #{VERSION}, reboot! \
-(use --never-reboot to avoid this from happening)")
-              terminate
+          update_one(r, opts) do |json, score|
+            r.assert_valid_score(score)
+            r.assert_score_ownership(score)
+            r.assert_score_strength(score) unless opts['ignore-score-weakness']
+            @remotes.rescore(score.host, score.port, score.value)
+            if Semantic::Version.new(VERSION) < Semantic::Version.new(json['version'])
+              if opts['reboot']
+                @log.info("#{r}: their version #{json['version']} is higher than mine #{VERSION}, reboot! \
+  (use --never-reboot to avoid this from happening)")
+                terminate
+              end
+              @log.debug("#{r}: their version #{json['version']} is higher than mine #{VERSION}, \
+  it's recommended to reboot, but I don't do it because of --never-reboot")
             end
-            @log.debug("#{r}: their version #{json['version']} is higher than mine #{VERSION}, \
-it's recommended to reboot, but I don't do it because of --never-reboot")
-          end
-          if Semantic::Version.new(VERSION) < Semantic::Version.new(Zold::Gem.new.last_version)
-            if opts['reboot']
-              @log.info("#{r}: the version of the gem is higher than mine #{VERSION}, reboot! \
-(use --never-reboot to avoid this from happening)")
-              terminate
+            if Semantic::Version.new(VERSION) < Semantic::Version.new(Zold::Gem.new.last_version)
+              if opts['reboot']
+                @log.info("#{r}: the version of the gem is higher than mine #{VERSION}, reboot! \
+  (use --never-reboot to avoid this from happening)")
+                terminate
+              end
+              @log.debug("#{r}: gem version is higher than mine #{VERSION}, \
+  it's recommended to reboot, but I don't do it because of --never-reboot")
             end
-            @log.debug("#{r}: gem version is higher than mine #{VERSION}, \
-it's recommended to reboot, but I don't do it because of --never-reboot")
-          end
-          if cycle.positive?
-            json['all'].each do |s|
-              next if @remotes.exists?(s['host'], s['port'])
-              add(s['host'], s['port'], opts)
+            if cycle.positive?
+              json['all'].each do |s|
+                next if @remotes.exists?(s['host'], s['port'])
+                add(s['host'], s['port'], opts)
+              end
             end
+            capacity << { host: score.host, port: score.port, count: json['all'].count }
+            @log.info("#{r}: the score is #{Rainbow(score.value).green} (#{json['version']}) in #{Age.new(start)}")
           end
-          capacity << { host: score.host, port: score.port, count: json['all'].count }
-          @log.info("#{r}: the score is #{Rainbow(score.value).green} (#{json['version']}) in #{Age.new(start)}")
         end
       end
       max_capacity = capacity.map { |c| c[:count] }.max || 0
@@ -304,6 +311,25 @@ it's recommended to reboot, but I don't do it because of --never-reboot")
       end
     end
 
+    def update_one(r, opts)
+      attempt = 0
+      begin
+        uri = '/remotes'
+        res = r.http(uri).get
+        r.assert_code(200, res)
+        json = JsonPage.new(res.body, uri).to_hash
+        score = Score.parse_json(json['score'])
+        yield json, score
+      rescue JsonPage::CantParse, Score::CantParse, RemoteNode::CantAssert => e
+        attempt += 1
+        if attempt < opts['retry']
+          @log.error("#{r} failed to read #{id}, trying again (attempt no.#{attempt}): #{e.message}")
+          retry
+        end
+        raise e
+      end
+    end
+
     def select(opts)
       selected = @remotes.all.sort_by { |r| r[:score] }.reverse.first(opts['max-nodes'])
       (@remotes.all - selected).each do |r|

data/lib/zold/remotes.rb

@@ -41,6 +41,9 @@ require_relative 'node/farm'
 module Zold
   # One remote.
   class RemoteNode
+    # When something is wrong with the assertion
+    class CantAssert < StandardError; end
+
     def initialize(host:, port:, score:, idx:, master:, network: 'test', log: Log::NULL)
       @host = host
       @port = port
@@ -67,30 +70,30 @@ module Zold
       msg = response.status_line.strip
       return if response.status.to_i == code
       if response.headers && response.headers['X-Zold-Error']
-        raise "Error ##{response.status} \"#{response.headers['X-Zold-Error']}\"
+        raise CantAssert, "Error ##{response.status} \"#{response.headers['X-Zold-Error']}\"
             at #{response.headers['X-Zold-Path']}"
       end
-      raise "Unexpected HTTP code #{response.status}, instead of #{code}" if msg.empty?
-      raise "#{msg} (HTTP code #{response.status}, instead of #{code})"
+      raise CantAssert, "Unexpected HTTP code #{response.status}, instead of #{code}" if msg.empty?
+      raise CantAssert, "#{msg} (HTTP code #{response.status}, instead of #{code})"
     end
 
     def assert_valid_score(score)
-      raise "Invalid score #{score.reduced(4)}" unless score.valid?
-      raise "Expired score (#{Age.new(score.time)}) #{score.reduced(4)}" if score.expired?
+      raise CantAssert, "Invalid score #{score.reduced(4)}" unless score.valid?
+      raise CantAssert, "Expired score (#{Age.new(score.time)}) #{score.reduced(4)}" if score.expired?
     end
 
     def assert_score_ownership(score)
-      raise "Masqueraded host #{@host} as #{score.host}: #{score.reduced(4)}" if @host != score.host
-      raise "Masqueraded port #{@port} as #{score.port}: #{score.reduced(4)}" if @port != score.port
+      raise CantAssert, "Masqueraded host #{@host} as #{score.host}: #{score.reduced(4)}" if @host != score.host
+      raise CantAssert, "Masqueraded port #{@port} as #{score.port}: #{score.reduced(4)}" if @port != score.port
     end
 
     def assert_score_strength(score)
       return if score.strength >= Score::STRENGTH
-      raise "Score #{score.strength} is too weak (<#{Score::STRENGTH}): #{score.reduced(4)}"
+      raise CantAssert, "Score #{score.strength} is too weak (<#{Score::STRENGTH}): #{score.reduced(4)}"
     end
 
     def assert_score_value(score, min)
-      raise "Score #{score.value} is too small (<#{min}): #{score.reduced(4)}" if score.value < min
+      raise CantAssert, "Score #{score.value} is too small (<#{min}): #{score.reduced(4)}" if score.value < min
     end
   end
 

data/lib/zold/version.rb

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

data/test/test_http.rb

@@ -116,9 +116,11 @@ class TestHttp < Zold::Test
     WebMock.allow_net_connect!
     body = ''
     RandomPort::Pool::SINGLETON.acquire do |port|
+      latch = Concurrent::CountDownLatch.new(1)
       thread = Thread.start do
         Zold::VerboseThread.new(test_log).run do
           server = TCPServer.new('127.0.0.1', port)
+          latch.count_down
           socket = server.accept
           loop do
             line = socket.gets
@@ -133,6 +135,7 @@ class TestHttp < Zold::Test
           socket.close
         end
       end
+      latch.wait
       res = Tempfile.open do |f|
         IO.write(f, 'How are you?')
         Zold::Http.new(uri: "http://127.0.0.1:#{port}/").put(f)
@@ -158,9 +161,11 @@ class TestHttp < Zold::Test
   def test_uploads_file
     WebMock.allow_net_connect!
     RandomPort::Pool::SINGLETON.acquire do |port|
+      latch = Concurrent::CountDownLatch.new(1)
       thread = Thread.start do
         Zold::VerboseThread.new(test_log).run do
           server = TCPServer.new(port)
+          latch.count_down
           socket = server.accept
           body = ''
           stops = 0
@@ -180,6 +185,7 @@ class TestHttp < Zold::Test
           socket.close_write
         end
       end
+      latch.wait
       content = "how are you\nmy friend"
       res = Tempfile.open do |f|
         IO.write(f, content)
@@ -196,14 +202,17 @@ class TestHttp < Zold::Test
     WebMock.allow_net_connect!
     RandomPort::Pool::SINGLETON.acquire do |port|
       content = "how are you\nmy friend" * 1000
+      latch = Concurrent::CountDownLatch.new(1)
       thread = Thread.start do
         Zold::VerboseThread.new(test_log).run do
           server = TCPServer.new(port)
+          latch.count_down
           socket = server.accept
           socket.print("HTTP/1.1 200 OK\nContent-Length: #{content.length}\n\n#{content}")
           socket.close_write
         end
       end
+      latch.wait
       body = Tempfile.open do |f|
         Zold::Http.new(uri: "http://localhost:#{port}/").get_file(f)
         IO.read(f)

data/test/test_hungry_wallets.rb

@@ -47,7 +47,7 @@ class TestHungryWallets < Zold::Test
       )
       wallets.acq(id) { |w| assert(!w.exists?) }
       pool.join(2)
-      assert_requested(get)
+      assert_requested(get, times: 2)
     end
   end
 end

data/test/test_metronome.rb

@@ -81,6 +81,7 @@ class TestMetronome < Zold::Test
 
     def exec(i)
       @count = i
+      sleep 0.1
       raise
     end
   end

data/test/test_wallet.rb

@@ -296,9 +296,10 @@ class TestWallet < Zold::Test
   end
 
   def test_collects_memory_garbage
-    skip
+    # skip
     require 'get_process_mem'
     start = GetProcessMem.new.bytes.to_i
+
     40.times do |i|
       wallet = Zold::Wallet.new('fixtures/448b451bc62e8e16.z')
       GC.start

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.21.4
+  version: 0.22.0
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-08 00:00:00.000000000 Z
+date: 2019-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace
@@ -744,7 +744,7 @@ licenses:
 - MIT
 metadata: {}
 post_install_message: |-
-  Thanks for installing Zold 0.21.4!
+  Thanks for installing Zold 0.22.0!
     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