zold 0.21.3 → 0.21.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b76d686809ed0f518c099bd7afbf901a6e4c8f8d4e23cd8950924a724396a082
-  data.tar.gz: 32f523eacb60a2a2c367fccf7ea1e732b1ed4c58ee763cc5effa654c770a5812
+  metadata.gz: 97e75811a1329436f6840794104457cfcc6cf123144fd5a248db333fec67e8f7
+  data.tar.gz: a7ffabc0edb17a8e59c588ed390c9efbd4f34483631178f995e33dd35c6a2539
 SHA512:
-  metadata.gz: 34659e7ff4e6e4718dc3832da26e93244c1665acd682c85b369e8c1f9239b44917077fa45f45b03971ea69c2dd2ea06ba7bbaf5a65817f0d5ff03ac72ba4bfa0
-  data.tar.gz: aac7c961982d024da032366651a5fd557980d3aa0074628941589b0969e670c78d6ac1a4cb710e56f900c75b351e017d9043083f913af1a9ebae10c4759afff7
+  metadata.gz: 12541b87e91a1597365b86e65a9eafe192c5362b492f54d16c24e244cf667a86168e63991f397cc3af791596e5ebaadf35aea64cb54cf042803768bdec5a5854
+  data.tar.gz: 9eb0728e374ff5c74e3db2992bf8d3bbcf3644deaa626df556f7a6fe1bcfdce9012d86e1f6a4280ee36b3ad6a4ff84e2ad2d922887b999dacb05a74d9d78cc13

data/lib/zold/commands/fetch.rb

@@ -25,6 +25,7 @@ require 'json'
 require 'time'
 require 'tempfile'
 require 'slop'
+require 'openssl'
 require 'rainbow'
 require 'concurrent/atomics'
 require 'zold/score'
@@ -145,23 +146,33 @@ run 'zold remote update' or use --tolerate-quorum=1"
       r.assert_valid_score(score)
       r.assert_score_ownership(score)
       r.assert_score_strength(score) unless opts['ignore-score-weakness']
-      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"
-        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 \
+      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"
+          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
       end
       score.value
     end

data/lib/zold/node/front.rb

@@ -22,7 +22,6 @@
 
 STDOUT.sync = true
 
-require 'eventmachine'
 require 'get_process_mem'
 require 'thin'
 require 'json'

data/lib/zold/version.rb

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

data/test/node/test_front.rb

@@ -20,7 +20,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-require 'eventmachine'
 require 'minitest/autorun'
 require 'json'
 require 'time'

data/test/test__helper.rb

@@ -21,7 +21,6 @@
 # SOFTWARE.
 
 gem 'openssl'
-require 'eventmachine'
 require 'openssl'
 require 'minitest/autorun'
 require 'minitest/hooks/test'

data/zold.gemspec

@@ -64,7 +64,7 @@ and suggests a different architecture for digital wallet maintenance.'
   s.add_runtime_dependency 'backtrace', '>=0.3'
   s.add_runtime_dependency 'concurrent-ruby', '1.1.3'
   s.add_runtime_dependency 'diffy', '3.2.1'
-  s.add_runtime_dependency 'futex', '0.8.5'
+  s.add_runtime_dependency 'futex', '>=0.8.5'
   s.add_runtime_dependency 'get_process_mem', '~>0.2'
   s.add_runtime_dependency 'json', '2.1.0'
   s.add_runtime_dependency 'memory_profiler', '0.9.12'
@@ -77,10 +77,10 @@ and suggests a different architecture for digital wallet maintenance.'
   s.add_runtime_dependency 'sys-proctable', '1.2.1'
   s.add_runtime_dependency 'thin', '1.7.2'
   s.add_runtime_dependency 'threads', '>=0.3'
-  s.add_runtime_dependency 'total', '>=0.2.0'
+  s.add_runtime_dependency 'total', '>=0.2'
   s.add_runtime_dependency 'typhoeus', '1.3.1'
   s.add_runtime_dependency 'usagewatch_ext', '0.2.1'
-  s.add_runtime_dependency 'zache', '>=0.7.0'
+  s.add_runtime_dependency 'zache', '>=0.7'
   s.add_runtime_dependency 'zold-score', '0.4.5'
   s.add_development_dependency 'codecov', '0.1.13'
   s.add_development_dependency 'cucumber', '3.1.2'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.21.3
+  version: 0.21.4
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -56,14 +56,14 @@ dependencies:
   name: futex
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.5
 - !ruby/object:Gem::Dependency
@@ -240,14 +240,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: typhoeus
   requirement: !ruby/object:Gem::Requirement
@@ -282,14 +282,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: zold-score
   requirement: !ruby/object:Gem::Requirement
@@ -744,7 +744,7 @@ licenses:
 - MIT
 metadata: {}
 post_install_message: |-
-  Thanks for installing Zold 0.21.3!
+  Thanks for installing Zold 0.21.4!
     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