zold 0.15.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e42d8de2d004ce5a9bfe7eaee7728dc0988a08482e5cc7d138de0c7bf8552fd4
-  data.tar.gz: 2e82e4cc5f59db84b8647396c902dbd6b86ec3769a4eb6cfd0ca922e6020c3d5
+  metadata.gz: a80f542fc3561bcd48d5f02f31630a14ca52ff17beda6ec8bda6460ca85fd54a
+  data.tar.gz: 258cf2d603a886678b3947e28a23bee64d6d57cc6e41cea9a1a9c21f7b18c054
 SHA512:
-  metadata.gz: 4f194dab4b5c826ce407effcc2374e77ba82c969adb3ff0780796702addb3db807b9f6d1bbf6ec15bd10f48a274561774414d913847429053980039f30d0dc3c
-  data.tar.gz: 255583b83271342d7895cff40965bb71bc13bc8608755a279c65e437a55858958b00e06d1bd88f46470f353fe06846f270e89a77018bc91acfd5f6efff43958e
+  metadata.gz: e64a730a188c183fd1a477900907f54fc0c3acb52db6f9c4c0dc88d70a700f762866fbc130e92cd6b782e6cfea04eb6f9e8f01f97ce1e7a0ba2e09212590bdae
+  data.tar.gz: f70009e27da61954ee250f107e3ddff12977f572e27dd4bf37c28ea20877b1adf36c5162bd0a5ba5169097a33e56712f13e04db6d14973fc219942e0fd85c39c

data/.gitignore

@@ -8,3 +8,4 @@ rdoc/
 .zoldata
 farm
 zold.log
+farm.lock

data/bin/zold

@@ -57,7 +57,7 @@ args = []
 unless ENV['RACK_ENV'] == 'test' || ARGV.find { |a| a == '--ignore-global-config' }
   config = File.expand_path('~/.zold')
   if File.exist?(config)
-    body = File.read(config)
+    body = IO.read(config)
     extra = body.split(/[\r\n]+/).map(&:strip)
     args += extra
     log.debug("Found #{body.split(/\n/).length} lines in #{config}")
@@ -144,10 +144,11 @@ Available options:"
   args << '--help' if opts.help?
   args << "--network=#{opts['network']}"
 
-  FileUtils.mkdir_p(opts[:home])
-  Dir.chdir(opts[:home])
+  home = File.expand_path(opts[:home])
+  FileUtils.mkdir_p(home)
+  Dir.chdir(home)
 
-  zoldata = File.expand_path(File.join(Dir.pwd, '.zoldata'))
+  zoldata = File.join(home, '.zoldata')
 
   unless opts['skip-upgrades']
     Zold::Upgrades.new(Zold::VersionFile.new(File.join(zoldata, 'version')), 'upgrades').run
@@ -170,9 +171,11 @@ Available options:"
     Zold::CachedWallets.new(
       command == 'node' ? Zold::TreeWallets.new('.') : Zold::Wallets.new('.')
     ),
-    File.join(zoldata, 'locks'), log: log
+    log: log
   )
-  remotes = Zold::Remotes.new(file: File.join(zoldata, 'remotes'), network: opts['network'])
+  fremotes = File.join(zoldata, 'remotes')
+  remotes = Zold::Remotes.new(file: fremotes, network: opts['network'])
+  remotes.defaults unless File.exist?(fremotes)
   copies = File.join(zoldata, 'copies')
 
   log.debug("Network: #{opts['network']}")

data/features/gem_package.feature

@@ -10,7 +10,7 @@ Feature: Gem Package
     require 'rubygems'
     spec = Gem::Specification::load('./spec.rb')
     if spec.executables.empty?
-      fail 'no executables: ' + File.read('./spec.rb')
+      fail 'no executables: ' + IO.read('./spec.rb')
     end
     """
     When I run bash with:

data/features/step_definitions/steps.rb

@@ -40,14 +40,14 @@ After do
 end
 
 When(%r{^I run ([a-z/-]+) with "([^"]*)"$}) do |cmd, args|
-  home = File.join(File.dirname(__FILE__), '../..')
+  home = File.expand_path(File.join(File.dirname(__FILE__), '../..'))
   @stdout = `ruby -I#{home}/lib #{home}/#{cmd} #{args} 2>&1`
   @exitstatus = $CHILD_STATUS.exitstatus
 end
 
 When(/^I run bash with:$/) do |text|
   FileUtils.copy_entry(@cwd, File.join(@dir, 'zold'))
-  File.write('run.sh', text)
+  IO.write('run.sh', text)
   @stdout = `/bin/bash run.sh 2>&1`
   @exitstatus = $CHILD_STATUS.exitstatus
 end

data/fixtures/merge/into-no-wallet/assert.rb

@@ -21,5 +21,5 @@
 # SOFTWARE.
 
 require_relative 'asserts'
-wallet = Zold::Wallet.new(Zold::Id.new('0123456789abcdef'))
+wallet = Zold::Wallet.new('0123456789abcdef.z')
 assert_equal(Zold::Amount.new(zld: 512.0), wallet.balance)

data/fixtures/merge/random-expenses/assert.rb

@@ -21,5 +21,5 @@
 # SOFTWARE.
 
 require_relative 'asserts.rb'
-wallet = Zold::Wallet.new(Zold::Id.new('0123456789abcdef'))
+wallet = Zold::Wallet.new('0123456789abcdef.z')
 assert_equal(Zold::Amount.new(zld: 388.0), wallet.balance)

data/fixtures/merge/simple-case/assert.rb

@@ -21,5 +21,5 @@
 # SOFTWARE.
 
 require_relative 'asserts'
-wallet = Zold::Wallet.new(Zold::Id.new('0123456789abcdef'))
+wallet = Zold::Wallet.new('0123456789abcdef.z')
 assert_equal(Zold::Amount.new(zld: 512.0), wallet.balance)

data/lib/zold/age.rb

@@ -21,6 +21,7 @@
 # SOFTWARE.
 
 require 'time'
+require 'rainbow'
 
 # Age in seconds.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -29,22 +30,29 @@ require 'time'
 module Zold
   # Age
   class Age
-    def initialize(time)
+    def initialize(time, limit: nil)
       @time = time.nil? || time.is_a?(Time) ? time : Time.parse(time)
+      @limit = limit
     end
 
     def to_s
       return '?' if @time.nil?
       sec = Time.now - @time
-      if sec < 1
-        "#{(sec * 1000).round}ms"
-      elsif sec < 60
-        "#{sec.round(2)}s"
-      elsif sec < 60 * 60
-        "#{(sec / 60).round}m"
+      txt = text(sec)
+      if !@limit.nil? && sec > @limit
+        Rainbow(txt).red
       else
-        "#{(sec / 3600).round}h"
+        txt
       end
     end
+
+    private
+
+    def text(sec)
+      return "#{(sec * 1000).round}ms" if sec < 1
+      return "#{sec.round(2)}s" if sec < 60
+      return "#{(sec / 60).round}m" if sec < 60 * 60
+      "#{(sec / 3600).round}h"
+    end
   end
 end

data/lib/zold/amount.rb

@@ -61,10 +61,12 @@ module Zold
 
     def to_s
       text = "#{to_zld}ZLD"
-      if negative?
+      if positive?
+        Rainbow(text).green
+      elsif negative?
         Rainbow(text).red
       else
-        Rainbow(text).green
+        text
       end
     end
 

data/lib/zold/cached_wallets.rb

@@ -50,12 +50,11 @@ module Zold
 
     def find(id)
       @wallets.find(id) do |wallet|
-        yield(
-          @mutex.synchronize do
-            @cache[id] = wallet unless @cache[id]
-            @cache[id]
-          end
-        )
+        w = @mutex.synchronize do
+          @cache[id] = wallet unless @cache[id]
+          @cache[id]
+        end
+        yield w
       end
     end
   end

data/lib/zold/commands/clean.rb

@@ -23,6 +23,7 @@
 require 'uri'
 require 'json'
 require 'time'
+require 'futex'
 require 'slop'
 require 'rainbow'
 require_relative 'args'
@@ -54,17 +55,23 @@ Available options:"
       end
       mine = Args.new(opts, @log).take || return
       (mine.empty? ? @wallets.all : mine.map { |i| Id.new(i) }).each do |id|
-        clean(Copies.new(File.join(@copies, id), log: @log), opts)
+        clean(id, Copies.new(File.join(@copies, id), log: @log), opts)
       end
     end
 
-    def clean(cps, _)
-      deleted = cps.clean
-      @log.debug("#{deleted} expired local copies removed for #{cps}, #{cps.all.count} left:")
-      cps.all.each do |c|
-        wallet = Wallet.new(c[:path])
-        @log.debug("  #{c[:name]}: #{c[:score]} #{wallet.balance}/#{wallet.txns.count}t/\
-#{wallet.digest[0, 6]}/#{Size.new(File.size(c[:path]))}/#{Age.new(File.mtime(c[:path]))}")
+    def clean(id, cps, _)
+      Futex.new(File.join(@copies, "#{id}-clean"), log: @log).open do
+        start = Time.now
+        deleted = cps.clean
+        @log.debug(
+          "#{deleted} expired local copies removed for #{cps} \
+in #{Age.new(start, limit: 0.01)}, #{cps.all.count} left:\n" +
+          cps.all.map do |c|
+            wallet = Wallet.new(c[:path])
+            "  #{c[:name]}: #{c[:score]} #{wallet.balance}/#{wallet.txns.count}t/\
+#{wallet.digest[0, 6]}/#{Size.new(File.size(c[:path]))}/#{Age.new(File.mtime(c[:path]))}"
+          end.join("\n")
+        )
       end
     end
   end

data/lib/zold/commands/diff.rb

@@ -67,12 +67,12 @@ Available options:"
         patch.join(Wallet.new(c[:path]))
       end
       before = @wallets.find(id) do |wallet|
-        File.read(wallet.path)
+        IO.read(wallet.path)
       end
       after = ''
-      Tempfile.open(['', Wallet::EXTENSION]) do |f|
+      Tempfile.open(['', Wallet::EXT]) do |f|
         patch.save(f.path, overwrite: true)
-        after = File.read(f)
+        after = IO.read(f)
       end
       diff = Diffy::Diff.new(before, after, context: 0).to_s(:color)
       @log.info(diff)

data/lib/zold/commands/fetch.rb

@@ -113,9 +113,9 @@ Available options:"
       r.assert_valid_score(score)
       r.assert_score_ownership(score)
       r.assert_score_strength(score) unless opts['ignore-score-weakness']
-      Tempfile.open(['', Wallet::EXTENSION]) do |f|
+      Tempfile.open(['', Wallet::EXT]) do |f|
         body = json['body']
-        File.write(f, body)
+        IO.write(f, body)
         wallet = Wallet.new(f.path)
         wallet.refurbish
         if wallet.protocol != Zold::PROTOCOL
@@ -127,10 +127,10 @@ Available options:"
         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(File.read(f), score.host, score.port, score.value)
+        copy = cps.add(IO.read(f), score.host, score.port, score.value)
         @log.info("#{r} returned #{Size.new(body.length)}/#{wallet.balance}/#{wallet.txns.count}t/\
 #{digest(json)}/#{Age.new(json['mtime'])}/#{json['copies']}c \
-as copy #{copy} of #{id} in #{Age.new(start)}: #{Rainbow(score.value).green} (#{json['version']})")
+as copy #{copy} of #{id} in #{Age.new(start, limit: 4)}: #{Rainbow(score.value).green} (#{json['version']})")
       end
       score.value
     end

data/lib/zold/commands/list.rb

@@ -37,10 +37,11 @@ module Zold
 
     def run(_ = [])
       @wallets.all.each do |id|
-        wallet = Wallet.new(File.join(@wallets.path, id))
-        msg = "#{id}: #{wallet.balance}/#{wallet.txns.count}t"
-        msg += " (net:#{wallet.network})" if wallet.network != Wallet::MAIN_NETWORK
-        @log.info(msg)
+        @wallets.find(id) do |wallet|
+          msg = "#{id}: #{wallet.balance}/#{wallet.txns.count}t"
+          msg += " (net:#{wallet.network})" if wallet.network != Wallet::MAIN_NETWORK
+          @log.info(msg)
+        end
       end
     end
   end

data/lib/zold/commands/merge.rb

@@ -85,9 +85,10 @@ Available options:"
           @log.debug("Local copy of #{id} is absent, nothing to merge")
         end
         modified = patch.save(wallet.path, overwrite: true)
+        wallet.flush
         if modified
           @log.info("#{cps.count} copies with the total score of #{score} successfully merged \
-into #{wallet.id}/#{wallet.balance}/#{wallet.txns.count}t in #{Age.new(start)}")
+into #{wallet.id}/#{wallet.balance}/#{wallet.txns.count}t in #{Age.new(start, limit: 0.1 + cps.count * 0.01)}")
         else
           @log.info("Nothing changed in #{wallet.id} after merge of #{cps.count} copies")
         end

data/lib/zold/commands/node.rb

@@ -153,13 +153,14 @@ module Zold
       raise '--invoice is mandatory' unless opts['invoice']
       if opts['nohup']
         pid = nohup(opts)
-        File.write(opts['save-pid'], pid) if opts['save-pid']
+        IO.write(opts['save-pid'], pid) if opts['save-pid']
         @log.debug("Process ID #{pid} saved into \"#{opts['save-pid']}\"")
         @log.info(pid)
         return
       end
       @log = Trace.new(@log, opts['trace-length'])
       Front.set(:log, @log)
+      Front.set(:logger, @log)
       Front.set(:trace, @log)
       Front.set(:nohup_log, opts['nohup-log']) if opts['nohup-log']
       Front.set(:version, opts['expose-version'])
@@ -168,9 +169,10 @@ module Zold
       Front.set(:halt, opts['halt-code'])
       Front.set(:disable_push, opts['disable-push'])
       Front.set(:disable_fetch, opts['disable-fetch'])
-      Front.set(:home, opts['home'])
+      home = File.expand_path(opts['home'])
+      Front.set(:home, home)
       @log.info("Time: #{Time.now.utc.iso8601}")
-      @log.info("Home directory: #{opts['home']}")
+      @log.info("Home directory: #{home}")
       @log.info("Ruby version: #{RUBY_VERSION}")
       @log.info("Zold gem version: #{Zold::VERSION}")
       @log.info("Zold protocol version: #{Zold::PROTOCOL}")
@@ -189,7 +191,7 @@ module Zold
         AccessLog: []
       )
       if opts['standalone']
-        @remotes = Zold::Remotes::Empty.new(file: '/tmp/standalone')
+        @remotes = Zold::Remotes::Empty.new
         @log.info('Running in standalone mode! (will never talk to other remotes)')
       elsif @remotes.exists?(host, port)
         Zold::Remote.new(remotes: @remotes).run(['remote', 'remove', host, port.to_s])
@@ -201,7 +203,7 @@ module Zold
       Front.set(:remotes, @remotes)
       Front.set(:copies, @copies)
       Front.set(:address, address)
-      Front.set(:root, opts['home'])
+      Front.set(:root, home)
       Front.set(:dump_errors, opts['dump-errors'])
       Front.set(:port, opts['bind-port'])
       Front.set(:reboot, !opts['never-reboot'])
@@ -227,21 +229,21 @@ module Zold
                   @remotes, @copies, address,
                   log: @log, network: opts['network']
                 ),
-                File.join(opts['home'], '.zoldata/entrance'),
+                File.join(home, '.zoldata/sync-entrance'),
                 log: @log
               ),
               @wallets, @remotes, address,
               log: @log,
               ignore_score_weakeness: opts['ignore-score-weakness']
             ),
-            File.join(opts['home'], '.zoldata/entrance'), log: @log
+            File.join(home, '.zoldata/async-entrance'), log: @log
           ),
           @wallets
         ),
         network: opts['network']
       ).start do |entrance|
         Front.set(:entrance, entrance)
-        Farm.new(invoice, File.join(opts['home'], 'farm'), log: @log)
+        Farm.new(invoice, File.join(home, 'farm'), log: @log)
           .start(host, opts[:port], threads: opts[:threads], strength: opts[:strength]) do |farm|
           Front.set(:farm, farm)
           metronome(farm, opts).start do |metronome|
@@ -383,19 +385,19 @@ module Zold
       end
 
       def info(msg)
-        @log.debug('WEBRICK ' + msg)
+        @log.debug("WEBRICK #{msg}")
       end
 
       def debug(msg)
         # nothing
       end
 
-      def error(msg)
-        @log.error('WEBRICK ' + msg)
+      def error(ex)
+        @log.error("WEBRICK #{Backtrace.new(ex)}")
       end
 
       def fatal(msg)
-        @log.error('WEBRICK ' + msg)
+        @log.error("WEBRICK #{msg}")
       end
 
       def debug?

data/lib/zold/commands/propagate.rb

@@ -91,8 +91,8 @@ Available options:"
         end
       end
       modified.uniq!
-      @log.debug("Wallet #{id} propagated successfully, #{total} txns in #{Age.new(start)}, \
-#{modified.count} wallets affected")
+      @log.debug("Wallet #{id} propagated successfully, #{total} txns \
+in #{Age.new(start, limit: 20 + total * 0.005)}, #{modified.count} wallets affected")
       modified
     end
   end

data/lib/zold/commands/push.rb

@@ -89,14 +89,14 @@ total score for #{id} is #{total}")
       start = Time.now
       content = @wallets.find(id) do |wallet|
         raise "The wallet #{id} is absent" unless wallet.exists?
-        File.read(wallet.path)
+        IO.read(wallet.path)
       end
       uri = "/wallet/#{id}"
       response = r.http(uri).put(content)
       @wallets.find(id) do |wallet|
         if response.code == '304'
           @log.info("#{r}: same version #{Size.new(content.length)}/#{wallet.txns.count}t \
-of #{wallet.id} there, in #{Age.new(start)}")
+of #{wallet.id} there, in #{Age.new(start, limit: 0.5)}")
           return 0
         end
         r.assert_code(200, response)
@@ -106,7 +106,7 @@ of #{wallet.id} there, in #{Age.new(start)}")
         r.assert_score_ownership(score)
         r.assert_score_strength(score) unless opts['ignore-score-weakness']
         @log.info("#{r} accepted #{Size.new(content.length)}/#{wallet.digest[0, 6]}/#{wallet.txns.count}t \
-of #{wallet.id} in #{Age.new(start)}: #{Rainbow(score.value).green} (#{json['version']})")
+of #{wallet.id} in #{Age.new(start, limit: 4)}: #{Rainbow(score.value).green} (#{json['version']})")
         score.value
       end
     end

data/lib/zold/commands/remove.rb

@@ -50,7 +50,10 @@ Available options:"
     end
 
     def remove(id, _)
-      @wallets.find(id) { |w| File.delete(w.path) }
+      @wallets.find(id) do |w|
+        raise "Wallet #{id} doesn't exist in #{w.path}" unless w.exists?
+        File.delete(w.path)
+      end
       @log.info("Wallet #{id} removed")
     end
   end