zold 0.22.4 → 0.22.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad91826d6e1a3e8d2b8b55ccdbf662ed3462098ad9ac97a638ca3a315ca16bf0
-  data.tar.gz: 139cd5314e6dd0dac0a10f20f0933e5e1d826820f4a3386eb3f7c643b49d8acc
+  metadata.gz: 03bad0932b6c80df634b1a0dd7149220767feb14818e8b22e310dad000630c24
+  data.tar.gz: eede3cc1a49152385f4ed01067343523719aaccb774e294a3f9b32987c53b155
 SHA512:
-  metadata.gz: 3004779c370ec2ce966c89cbfa4e004c5b8644e164da6ab7a6dfb3be0eb64020853979eb6cf9ab2b8a980f0d6b0b8b610dfa44a47cdb351bd25c3d7b95341702
-  data.tar.gz: e9901486c5cb9f653723687091a25a4902e30818757a4cd56d71c7dced8a83c5dfbefd8de77b73b5053c3e91836e6edd33dbf1169edb914e10d2e6691f35a5b5
+  metadata.gz: 3ff2d16edc4fa1319d41622c3362e38c2e586701670e71883e6a31cc7a4d42a1dbede754009de98b7f2386e212a6d501ca7f4a8abeb6a4d1317a61e7211ab1b8
+  data.tar.gz: 492ddd34efe4982713b3db909d8a260dac6ca18021474a26fd60200860e2bfb02d6d1d5d0a0a5da822728ad59b49c63a8bb950a93eb84e9bf399f6e37d623269

data/lib/zold/commands/merge.rb

@@ -94,7 +94,7 @@ Available options:"
         @wallets.acq(id) do |w|
           if w.exists?
             s = Time.now
-            merge_one(opts, patch, w, 'localhost', legacy: true)
+            merge_one(opts, patch, w, 'localhost', baseline: false, legacy: true)
             @log.debug("Local legacy copy of #{id} merged in #{Age.new(s)}: #{patch}")
           end
         end
@@ -102,7 +102,7 @@ Available options:"
       cps.each_with_index do |c, idx|
         wallet = Wallet.new(c[:path])
         name = "#{c[:name]}/#{idx}/#{c[:score]}"
-        merge_one(opts, patch, wallet, name)
+        merge_one(opts, patch, wallet, name, baseline: !opts['no-baseline'])
         score += c[:score]
       end
       @wallets.acq(id) do |w|
@@ -125,10 +125,10 @@ into #{@wallets.acq(id, &:mnemo)} in #{Age.new(start, limit: 0.1 + cps.count * 0
       modified
     end
 
-    def merge_one(opts, patch, wallet, name, legacy: false)
+    def merge_one(opts, patch, wallet, name, baseline: false, legacy: false)
       start = Time.now
       @log.debug("Building a patch for #{wallet.id} from remote copy ##{name} with #{wallet.mnemo}...")
-      patch.join(wallet, baseline: !opts['no-baseline'], legacy: legacy) do |id|
+      patch.join(wallet, baseline: baseline, legacy: legacy) do |id|
         unless opts['shallow']
           Pull.new(wallets: @wallets, remotes: @remotes, copies: @copies, log: @log).run(
             ['pull', id.to_s, "--network=#{opts['network']}", '--shallow']

data/lib/zold/commands/push.rb

@@ -137,7 +137,7 @@ out of #{nodes.value} in #{Age.new(start)}, total score for #{id} is #{total.val
         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']})")
+#{Rainbow(score.value).green} (#{json['version']})")
         end
         score.value
       end
@@ -146,13 +146,15 @@ out of #{nodes.value} in #{Age.new(start)}, total score for #{id} is #{total.val
     def read_one(id, r, opts)
       start = Time.now
       uri = "/wallet/#{id}"
+      attempt = 0
       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 #{@wallets.acq(id, &:mnemo)} there, in #{Age.new(start, limit: 0.5)}")
+          @log.info("#{r}: same version of #{@wallets.acq(id, &:mnemo)} there, didn't push
+in #{Age.new(start, limit: 0.5)}")
           return 0
         end
         r.assert_code(200, response)

data/lib/zold/commands/remote.rb

@@ -269,24 +269,7 @@ Available options:"
             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
-            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
+            reboot(r, json, opts)
             if cycle.positive?
               json['all'].each do |s|
                 next if @remotes.exists?(s['host'], s['port'])
@@ -330,6 +313,30 @@ Available options:"
       end
     end
 
+    def reboot(r, json, opts)
+      return unless json['repo'] == Zold::REPO
+      mine = Semantic::Version.new(VERSION)
+      if mine < 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
+      if mine < 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 lower or equal to mine #{VERSION}, no need to reboot")
+    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/node/front.rb

@@ -376,6 +376,7 @@ this is not a normal behavior, you may want to report a bug to our GitHub reposi
       content_type('application/json')
       pretty(
         version: settings.opts['expose-version'],
+        repo: Zold::REPO,
         alias: settings.node_alias,
         score: score.to_h,
         all: all_remotes,

data/lib/zold/node/spread_entrance.rb

@@ -96,7 +96,7 @@ module Zold
     def push(id, body)
       mods = @entrance.push(id, body)
       return mods if @remotes.all.empty?
-      (mods + [id]).each do |m|
+      mods.each do |m|
         next if @seen.include?(m)
         @mutex.synchronize { @seen << m }
         @modified.push(m)

data/lib/zold/patch.rb

@@ -44,6 +44,12 @@ module Zold
       "#{@txns.count} txns"
     end
 
+    # Joins a new wallet on top of existing patch. An attempt is made to
+    # copy as many transactions from the newcoming wallet to the existing
+    # set of transactions, avoiding mistakes and duplicates.
+    #
+    # If +baseline+ is set to TRUE the provided wallet is considered to be
+    # the baseline and all transactions will be blindly trusted.
     def join(wallet, baseline: true, legacy: false)
       if @id.nil?
         @id = wallet.id

data/lib/zold/version.rb

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

data/test/commands/test_merge.rb

@@ -149,9 +149,10 @@ class TestMerge < Zold::Test
         copies = File.join(dir, 'copies')
         remotes = Zold::Remotes.new(file: File.join(dir, 'remotes'))
         Zold::Merge.new(wallets: wallets, remotes: remotes, copies: copies, log: test_log).run(
-          %w[merge 0123456789abcdef]
+          %w[merge 0123456789abcdef --shallow]
         )
         Dir.chdir(dir) do
+          test_log.info("Testing #{f}...")
           require File.join(dir, 'assert.rb')
         end
       end

data/test/commands/test_remote.rb

@@ -87,6 +87,7 @@ class TestRemote < Zold::Test
         body: {
           version: Zold::VERSION,
           score: zero.to_h,
+          repo: Zold::REPO,
           all: [
             { host: zero.host, port: zero.port }
           ]
@@ -94,7 +95,7 @@ class TestRemote < Zold::Test
       )
       stub_request(:get, 'https://rubygems.org/api/v1/versions/zold/latest.json').to_return(
         status: 200,
-        body: '{"version": "9.9.9"}'
+        body: '{"version": "9.9.9", "repo": "' + Zold::REPO + '"}'
       )
       log = TestLogger.new
       cmd = Zold::Remote.new(remotes: remotes, log: log)

metadata

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