zold 0.26.10 → 0.26.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0eb2f544daa848545dbc287811d8bf14a3d691dbcb63bdf947c53660be7c7f0
-  data.tar.gz: 6126407c380aaf900613521f39feb4ae3af39e1badb6824aed3691fbcabbe800
+  metadata.gz: 1d0d8d5abb824adcb3222588744bd9f51b095b6a35d7de3401d6155867899bbd
+  data.tar.gz: 04e0597677b18e5f3e63b2492b5541352391522d3f92b092bddba7095dcd8c38
 SHA512:
-  metadata.gz: 07e2cf7c0014c54bdacbf31b7efe09d71224e4305953f24282b8568e8b8a0b3dcb748fb3ff14dfe4a8b7152d150a44903b18976f4aff19bfebc011d043860d22
-  data.tar.gz: 5a8f701777875c91cb072ff8d97eee4790365d0338a0c5760780d8d6e5e873681db6e78212b8ef07b990cca4b56b7c3f5b02f065d9045aa82f388aa242060749
+  metadata.gz: 9702cf51e271bbdad9ccb1a635e3274c49499e5070b3b18f20e239f97060c2f2edfc7b19b18f4af90c989eb33fb987c96312ccab8c172c26a131a4a0ebdc73f1
+  data.tar.gz: 96a39ed4f622342873430f0b9183ea1370f4520b3042d20fc5f3b40e313940f0fd844750ce6d5fcfbf12166b252c6c4408ef6fad446e3308c3d39e618c4e5f6a

data/lib/zold/commands/clean.rb

@@ -56,6 +56,9 @@ Available options:"
         o.integer '--threads',
           'How many threads to use for cleaning copies (default: 1)',
           default: 1
+        o.integer '--max-age',
+          'Maximum age for a copy to stay, in hours (default: 24)',
+          default: 24
         o.bool '--help', 'Print instructions'
       end
       mine = Args.new(opts, @log).take || return
@@ -65,9 +68,9 @@ Available options:"
       end
     end
 
-    def clean(cps, _)
+    def clean(cps, opts)
       start = Time.now
-      deleted = cps.clean
+      deleted = cps.clean(max: opts['max-age'])
       list = cps.all.map do |c|
         wallet = Wallet.new(c[:path])
         "#{c[:name]}: #{c[:score]} #{wallet.mnemo} \

data/lib/zold/commands/fetch.rb

@@ -156,15 +156,7 @@ 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']
-        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?
+        unless existing_copy_added(id, cps, score, r, json)
           Tempfile.open(['', Wallet::EXT]) do |f|
             r.http("/wallet/#{id}.bin").get_file(f)
             wallet = Wallet.new(f.path)
@@ -208,6 +200,17 @@ as copy ##{copy}/#{cps.all.count} in #{Age.new(start, limit: 4)}: \
       end
     end
 
+    def existing_copy_added(id, cps, score, r, json)
+      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}")
+        return true
+      end
+      false
+    end
+
     def digest(json)
       hash = json['digest']
       return '?' if hash.nil?

data/lib/zold/commands/node.rb

@@ -438,9 +438,11 @@ the node won\'t connect to the network like that; try to do "zold remote reset"
           @log.info('Reconnect is disabled because of --skip-reconnect')
         else
           require_relative 'routines/reconnect'
-          metronome.add(Routines::Reconnect.new(opts, @remotes, farm, network: opts['network'], log: @log))
+          metronome.add(Routines::Reconnect.new(opts, @remotes, farm, log: @log))
         end
       end
+      require_relative 'routines/spread'
+      metronome.add(Routines::Spread.new(opts, @wallets, @remotes, @copies, log: @log))
       @log.info('Metronome started (use --no-metronome to disable it)')
       metronome
     end

data/lib/zold/commands/propagate.rb

@@ -95,6 +95,9 @@ Available options:"
       modified.uniq!
       @log.debug("Wallet #{id} propagated successfully, #{total} txns \
 in #{Age.new(start, limit: 20 + total * 0.005)}, #{modified.count} wallets affected")
+      modified.each do |w|
+        @wallets.acq(w, &:refurbish)
+      end
       modified
     end
   end

data/lib/zold/commands/routines/reconnect.rb

@@ -32,11 +32,10 @@ module Zold
   module Routines
     # Reconnect to the network
     class Reconnect
-      def initialize(opts, remotes, farm = Farm::Empty.new, network: 'test', log: Log::NULL)
+      def initialize(opts, remotes, farm = Farm::Empty.new, log: Log::NULL)
         @opts = opts
         @remotes = remotes
         @farm = farm
-        @network = network
         @log = log
       end
 

data/lib/zold/commands/routines/spread.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2018 Yegor Bugayenko
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the 'Software'), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require_relative '../../log'
+require_relative '../../id'
+require_relative '../../copies'
+require_relative '../push'
+
+# Spread random wallets to the network.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2018 Yegor Bugayenko
+# License:: MIT
+module Zold
+  # Routines module
+  module Routines
+    # Spread them
+    class Spread
+      def initialize(opts, wallets, remotes, copies, log: Log::NULL)
+        @opts = opts
+        @wallets = wallets
+        @remotes = remotes
+        @copies = copies
+        @log = log
+      end
+
+      def exec(_ = 0)
+        sleep(60) unless @opts['routine-immediately']
+        @wallets.all.sample(100).each do |id|
+          next if Copies.new(File.join(@copies, id)).all.count < 2
+          Push.new(wallets: @wallets, remotes: @remotes, log: @log).run(
+            ['push', "--network=#{@opts['network']}", id.to_s]
+          )
+        end
+      end
+    end
+  end
+end

data/lib/zold/copies.rb

@@ -53,10 +53,11 @@ module Zold
       File.basename(@dir)
     end
 
-    def clean
+    # Delete all copies that are older than the "max" age provided, in seconds.
+    def clean(max: 24 * 60 * 60)
       Futex.new(file, log: @log).open do
         list = load
-        list.reject! { |s| s[:time] < Time.now - 24 * 60 * 60 }
+        list.reject! { |s| s[:time] < Time.now - max }
         save(list)
         deleted = 0
         files.each do |f|

data/lib/zold/id.rb

@@ -20,6 +20,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+require 'csv'
+
 # The ID of the wallet.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
@@ -31,10 +33,15 @@ module Zold
     PTN = Regexp.new('^[0-9a-fA-F]{16}$')
     private_constant :PTN
 
+    # Returns a list of banned IDs, as strings
+    BANNED = begin
+      CSV.read(File.join(__dir__, '../../resources/banned-wallets.csv')).map { |r| r[0] }
+    end
+
     def self.generate_id
       loop do
         id = format('%016x', rand(2**32..2**64 - 1))
-        next if IO.read(File.join(__dir__, '../../resources/banned-wallets.csv')).include?("\"#{id}\"")
+        next if Id::BANNED.include?(id)
         return id
       end
     end

data/lib/zold/node/entrance.rb

@@ -74,22 +74,25 @@ module Zold
       raise 'Body can\'t be nil' if body.nil?
       start = Time.now
       copies = Copies.new(File.join(@copies, id.to_s))
-      localhost = '0.0.0.0'
-      copies.add(body, localhost, Remotes::PORT, 0)
+      host = '0.0.0.0'
+      copies.add(body, host, Remotes::PORT, 0)
       unless @remotes.all.empty?
         Fetch.new(
           wallets: @wallets, remotes: @remotes, copies: copies.root, log: @log
         ).run(['fetch', id.to_s, "--ignore-node=#{@address}", "--network=#{@network}", '--quiet-if-absent'])
       end
       modified = merge(id, copies)
-      Clean.new(wallets: @wallets, copies: copies.root, log: @log).run(['clean', id.to_s])
-      copies.remove(localhost, Remotes::PORT)
+      Clean.new(wallets: @wallets, copies: copies.root, log: @log).run(
+        ['clean', id.to_s, '--max-age=1']
+      )
+      copies.remove(host, Remotes::PORT)
       modified += Rebase.new(wallets: @wallets, log: @log).run(['rebase', id.to_s])
       if modified.empty?
         @log.info("Accepted #{id} in #{Age.new(start, limit: 1)} and not modified anything")
       else
         @log.info("Accepted #{id} in #{Age.new(start, limit: 1)} and modified #{modified.join(', ')}")
       end
+      modified << id if copies.all.count > 1
       sec = (Time.now - start).round(2)
       @mutex.synchronize do
         @history.shift if @history.length >= 16

data/lib/zold/node/front.rb

@@ -313,7 +313,8 @@ this is not a normal behavior, you may want to report a bug to our GitHub reposi
           "Balance: #{wallet.balance.to_zld(8)} ZLD (#{wallet.balance.to_i} zents)",
           "Transactions: #{wallet.txns.count}",
           "Taxes: #{Tax.new(wallet).paid} paid, the debt is #{Tax.new(wallet).debt}",
-          "File size: #{Size.new(wallet.size)}, #{Copies.new(File.join(settings.copies, wallet.id)).all.count} copies",
+          "File size: #{Size.new(wallet.size)}/#{wallet.size}, \
+#{Copies.new(File.join(settings.copies, wallet.id)).all.count} copies",
           "Modified: #{wallet.mtime.utc.iso8601} (#{Age.new(wallet.mtime.utc.iso8601)} ago)",
           "Digest: #{wallet.digest}"
         ].join("\n")
@@ -523,7 +524,7 @@ time to stop; use --skip-oom to never quit")
     end
 
     def ban(id)
-      return unless IO.read(File.join(__dir__, '../../../resources/banned-wallets.csv')).include?("\"#{id}\"")
+      return unless Id::BANNED.include?(id.to_s)
       error(404, "The wallet #{id} is banned")
     end
 

data/lib/zold/patch.rb

@@ -162,8 +162,8 @@ doesn't have this transaction: \"#{txn.to_text}\"")
     def save(file, overwrite: false)
       raise 'You have to join at least one wallet in' if empty?
       before = ''
-      before = OpenSSL::Digest::SHA256.file(file).hexdigest if File.exist?(file)
       wallet = Wallet.new(file)
+      before = wallet.digest if wallet.exists?
       wallet.init(@id, @key, overwrite: overwrite, network: @network)
       File.open(file, 'a') do |f|
         @txns.each do |txn|
@@ -171,8 +171,7 @@ doesn't have this transaction: \"#{txn.to_text}\"")
         end
       end
       wallet.refurbish
-      after = OpenSSL::Digest::SHA256.file(file).hexdigest
-      before != after
+      before != wallet.digest
     end
   end
 end

data/lib/zold/version.rb

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

data/test/fake_home.rb

@@ -45,9 +45,7 @@ class FakeHome
   def run
     Dir.mktmpdir do |dir|
       FileUtils.copy(File.expand_path(File.join(__dir__, '../fixtures/id_rsa')), File.join(dir, 'id_rsa'))
-      result = yield FakeHome.new(dir, log: @log)
-      sleep 0.5 # It's a workaround against a bug (without it tests fail sporadically)
-      result
+      yield FakeHome.new(dir, log: @log)
     end
   end
 

data/test/test_id.rb

@@ -37,6 +37,10 @@ class TestId < Zold::Test
     end
   end
 
+  def test_list_of_banned_ids_is_not_empty
+    assert(!Zold::Id::BANNED.empty?)
+  end
+
   def test_checks_for_root
     assert(Zold::Id::ROOT.root?)
   end

data/test/upgrades/test_delete_banned_wallets.rb

@@ -32,7 +32,7 @@ require_relative '../fake_home'
 # License:: MIT
 class TestDeleteBannedWallets < Zold::Test
   def test_delete_them
-    id = Zold::Id.new(CSV.read(File.join(__dir__, '../../resources/banned-wallets.csv'))[0][0])
+    id = Zold::Id.new(Zold::Id::BANNED[0])
     FakeHome.new(log: test_log).run do |home|
       home.create_wallet(id)
       FileUtils.mkdir_p(File.join(home.dir, 'a/b/c'))

data/upgrades/delete_banned_wallets.rb

@@ -33,12 +33,11 @@ module Zold
     end
 
     def exec
-      banned = IO.read(File.join(__dir__, '../resources/banned-wallets.csv'))
       DirItems.new(@home).fetch.each do |path|
         name = File.basename(path)
         next unless name =~ /^[a-f0-9]{16}#{Wallet::EXT}$/
-        id = name[0..15]
-        next unless banned.include?("\"#{id}\"")
+        id = Id.new(name[0..15])
+        next unless Id::BANNED.include?(id.to_s)
         path = File.join(@home, path)
         File.rename(path, path + '-banned')
         @log.info("Wallet file #{path} renamed, since wallet #{id} is banned")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.26.10
+  version: 0.26.11
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-08 00:00:00.000000000 Z
+date: 2019-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace
@@ -641,6 +641,7 @@ files:
 - lib/zold/commands/routines/audit.rb
 - lib/zold/commands/routines/gc.rb
 - lib/zold/commands/routines/reconnect.rb
+- lib/zold/commands/routines/spread.rb
 - lib/zold/commands/show.rb
 - lib/zold/commands/taxes.rb
 - lib/zold/commands/thread_badge.rb
@@ -772,7 +773,7 @@ licenses:
 - MIT
 metadata: {}
 post_install_message: |-
-  Thanks for installing Zold 0.26.10!
+  Thanks for installing Zold 0.26.11!
     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