zold 0.17.10 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80212bbebddbc1807018d0ddaf9ce6af4e902b446840efa3976f2bf8aaf70e7f
-  data.tar.gz: 962892885f128f4841e36f7c75146ab695832e4a499822acf46fc07e5799934d
+  metadata.gz: 0ad2aeab01e066ea22a6fb9e5cd02c2d13a88e36f19e8ffc228c5f72d5b5bf1e
+  data.tar.gz: f87c069877d7741c99a38ebfade27d41721f9347a996b6ef4640c899ebe558af
 SHA512:
-  metadata.gz: bf58960e766640f2acf4e6d1665dcbb896ac8590994147e0e8a3819d753633d4d6fe8d126d11637a4c8e5ef702c061b0e21202c411fa5c4f7b2b59f26cfff38c
-  data.tar.gz: 300f10b27f536f837526f9d8464990fad14757152eb925096d863fed6e7f50a8c9b7005b3dfd6cd40926116611869f0849bac78ef54361d292a8326e955f27d7
+  metadata.gz: b47678bd890369fe2a3d09268c1f3ab35bb5e1707ae052353865c899334276b840099465e5a1be46537021e60a01891dafca7071b95a85ff8fe9fb90c02fcf9c
+  data.tar.gz: 8769ceb3b043b1eb7fe0de15be8574ae1ff5f9191fadbe58daa6c1de25ca2768652faac9c636229d181ed0039352fffc75d5673b04de5c9f2ed953d009e2dd52

data/lib/zold/cached_wallets.rb

@@ -53,6 +53,10 @@ module Zold
       @wallets.all
     end
 
+    def count
+      @wallets.count
+    end
+
     def acq(id, exclusive: false)
       @wallets.acq(id, exclusive: exclusive) do |wallet|
         c = @zache.get(id.to_s, lifetime: 5 * 60) { wallet }

data/lib/zold/commands/propagate.rb

@@ -75,7 +75,7 @@ Available options:"
         end
         @wallets.acq(t.bnf, exclusive: true) do |target|
           unless target.exists?
-            @log.debug("#{t.amount * -1} to #{t.bnf}: wallet is absent")
+            @log.debug("#{t.amount * -1} from #{id} to #{t.bnf}: wallet is absent")
             next
           end
           unless target.network == network

data/lib/zold/commands/remote.rb

@@ -227,7 +227,7 @@ Available options:"
       if scores.empty?
         @log.info("No winners elected out of #{@remotes.all.count} remotes")
       else
-        scores.each { |s| @log.info("Elected: #{s}") }
+        scores.each { |s| @log.info("Elected: #{s.reduced(4)}") }
       end
       scores
     end
@@ -295,7 +295,9 @@ it's recommended to reboot, but I don't do it because of --never-reboot")
       selected = @remotes.all.sort_by { |r| r[:score] }.reverse.first(opts['max-nodes'])
       (@remotes.all - selected).each do |r|
         @remotes.remove(r[:host], r[:port])
+        @log.info("Remote #{r[:host]}:#{r[:port]}/#{r[:score]} removed from the list, #{@remotes.all.count} left")
       end
+      @log.info("#{opts['max-nodes']} remote nodes left in the list")
     end
 
     def terminate

data/lib/zold/http.rb

@@ -145,7 +145,7 @@ module Zold
       headers[Http::VERSION_HEADER] = Zold::VERSION
       headers[Http::PROTOCOL_HEADER] = Zold::PROTOCOL.to_s
       headers[Http::NETWORK_HEADER] = @network
-      headers[Http::SCORE_HEADER] = @score.reduced(4).to_text if @score.valid? && !@score.expired? && @score.value > 3
+      headers[Http::SCORE_HEADER] = @score.reduced(4).to_s if @score.valid? && !@score.expired? && @score.value > 3
       headers
     end
   end

data/lib/zold/node/front.rb

@@ -105,7 +105,7 @@ while #{settings.address} is in '#{settings.opts['network']}'")
         if settings.opts['standalone']
           settings.log.debug("#{request.url}: we are in standalone mode, won't update remotes")
         else
-          s = Score.parse_text(header)
+          s = Score.parse(header)
           error(400, 'The score is invalid') unless s.valid?
           error(400, 'The score is weak') if s.strength < Score::STRENGTH && !settings.opts['ignore-score-weakness']
           return if s.value < Front::MIN_SCORE && !settings.opts['ignore-score-weakness']
@@ -136,7 +136,7 @@ while #{settings.address} is in '#{settings.opts['network']}'")
       headers['X-Zold-Thread'] = Thread.current.object_id.to_s
       unless @start.nil?
         if Time.now - @start > 1
-          settings.log.info("Slow response to #{request.request_method} #{request.url}
+          settings.log.info("Slow response to #{request.request_method} #{request.url} \
 from #{request.ip} in #{Age.new(@start, limit: 1)}")
         end
         headers['X-Zold-Milliseconds'] = ((Time.now - @start) * 1000).round.to_s
@@ -428,7 +428,11 @@ from #{request.ip} in #{Age.new(@start, limit: 1)}")
       e = env['sinatra.error']
       content_type 'text/plain'
       headers['X-Zold-Error'] = e.message
-      settings.log.error(Backtrace.new(e).to_s) unless e.is_a?(SoftError)
+      if e.is_a?(SoftError)
+        settings.log.info("#{request.ip}:#{request.request_method}:#{request.url}: #{e.message}")
+      else
+        settings.log.error(Backtrace.new(e).to_s)
+      end
       if e.is_a?(Errno::ENOMEM) && !settings.opts['skip-oom']
         settings.log.error("We are running out of memory (#{Size.new(GetProcessMem.new.bytes.to_i)}), \
 time to stop; use --skip-oom to never quit")
@@ -452,7 +456,7 @@ time to stop; use --skip-oom to never quit")
     def total_wallets
       return 256 if settings.opts['network'] == Wallet::MAINET
       settings.zache.get(:wallets, lifetime: settings.opts['no-cache'] ? 0 : 60) do
-        settings.wallets.all.count
+        settings.wallets.count
       end
     end
 

data/lib/zold/remotes.rb

@@ -189,7 +189,7 @@ module Zold
       return if list.empty?
       best = farm.best[0]
       score = best.nil? ? Score::ZERO : best
-      idx = 0
+      idx = Concurrent::AtomicFixnum.new
       pool = Concurrent::FixedThreadPool.new([list.count, Concurrent.processor_count * 4].min, max_queue: 0)
       list.each do |r|
         pool.post do
@@ -201,7 +201,7 @@ module Zold
               host: r[:host],
               port: r[:port],
               score: score,
-              idx: idx,
+              idx: idx.increment - 1,
               log: log,
               network: @network
             )
@@ -213,7 +213,6 @@ module Zold
             remove(r[:host], r[:port]) if errors > TOLERANCE
           end
         end
-        idx += 1
       end
       pool.shutdown
       pool.kill unless pool.wait_for_termination(5 * 60)
@@ -231,6 +230,7 @@ module Zold
       raise 'Port can\'t be nil' if port.nil?
       raise 'Score can\'t be nil' if score.nil?
       raise 'Port has to be of type Integer' unless port.is_a?(Integer)
+      raise 'Score has to be of type Integer' unless score.is_a?(Integer)
       if_present(host, port) { |r| r[:score] = score }
     end
 

data/lib/zold/sync_wallets.rb

@@ -23,17 +23,19 @@
 require 'futex'
 require_relative 'log'
 
-# Sync collection of wallets.
+# Synchronized collection of wallets.
+#
+# This is a decorator for the Wallets class.
+#
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 module Zold
   # Synchronized collection of wallets
   class SyncWallets
-    def initialize(wallets, timeout: 30, log: Log::NULL, dir: wallets.path)
+    def initialize(wallets, log: Log::NULL, dir: wallets.path)
       @wallets = wallets
       @log = log
-      @timeout = timeout
       @dir = dir
     end
 
@@ -49,6 +51,10 @@ module Zold
       @wallets.all
     end
 
+    def count
+      @wallets.count
+    end
+
     def acq(id, exclusive: false)
       @wallets.acq(id, exclusive: exclusive) do |wallet|
         Futex.new(wallet.path, log: @log, lock: File.join(@dir, "#{id}.lock")).open(exclusive) do

data/lib/zold/tax.rb

@@ -57,6 +57,14 @@ module Zold
     PREFIX = 'TAXES'
     private_constant :PREFIX
 
+    # When score strengths were updated. The numbers here indicate the
+    # strengths we accepted before these dates.
+    MILESTONES = {
+      Time.parse('30-11-2018') => 6,
+      Time.parse('09-12-2018') => 7
+    }.freeze
+    private_constant :MILESTONES
+
     def initialize(wallet, ignore_score_weakness: false, strength: Score::STRENGTH)
       raise "The wallet must be of type Wallet: #{wallet.class.name}" unless wallet.is_a?(Wallet)
       @wallet = wallet
@@ -70,7 +78,7 @@ module Zold
     end
 
     def details(best)
-      "#{PREFIX} #{best.reduced(EXACT_SCORE).to_text}"
+      "#{PREFIX} #{best.reduced(EXACT_SCORE)}"
     end
 
     def pay(pvt, best)
@@ -94,9 +102,11 @@ module Zold
       scored = txns.map do |t|
         pfx, body = t.details.split(' ', 2)
         next if pfx != PREFIX || body.nil?
-        score = Score.parse_text(body)
+        score = Score.parse(body)
         next if !score.valid? || score.value != EXACT_SCORE
-        next if score.strength < @strength && !@ignore_score_weakness
+        if score.strength < @strength && !@ignore_score_weakness
+          next unless MILESTONES.find { |d, s| t.date < d && score.strength >= s }
+        end
         next if t.amount > MAX_PAYMENT
         t
       end.compact.uniq(&:details)

data/lib/zold/tree_wallets.rb

@@ -65,5 +65,9 @@ module Zold
         File.join(path, (id.to_s.split('', 5).take(4) + [id.to_s]).join('/') + Wallet::EXT)
       )
     end
+
+    def count
+      `find . -name "*.z" | wc -l`.strip.to_i
+    end
   end
 end

data/lib/zold/txn.rb

@@ -35,7 +35,7 @@ module Zold
   # A single transaction
   class Txn
     # Regular expression for details
-    RE_DETAILS = '[a-zA-Z0-9 @\!\?\*_\-\.:,\']+'
+    RE_DETAILS = '[a-zA-Z0-9 @\!\?\*_\-\.:,\'/]+'
     private_constant :RE_DETAILS
 
     # Regular expression for prefix

data/lib/zold/version.rb

@@ -25,6 +25,6 @@
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 module Zold
-  VERSION = '0.17.10'
+  VERSION = '0.18.0'
   PROTOCOL = 2
 end

data/lib/zold/wallets.rb

@@ -25,6 +25,9 @@ require_relative 'wallet'
 require_relative 'dir_items'
 
 # The local collection of wallets.
+#
+# This class is not thread-safe!
+#
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
@@ -67,5 +70,9 @@ module Zold
       raise "Id must be of type Id, #{id.class.name} instead" unless id.is_a?(Id)
       yield Wallet.new(File.join(path, id.to_s + Wallet::EXT))
     end
+
+    def count
+      Zold::DirItems.new(@dir).fetch(recursive: false).count
+    end
   end
 end

data/test/commands/test_remote.rb

@@ -177,32 +177,9 @@ class TestRemote < Zold::Test
     Dir.mktmpdir do |dir|
       remotes = Zold::Remotes.new(file: File.join(dir, 'remotes.txt'))
       cmd = Zold::Remote.new(remotes: remotes, log: test_log)
-      suffixes = []
-      (5000..5010).each do |port|
-        score = Zold::Score.new(
-          host: 'example.com',
-          port: port,
-          invoice: 'MYPREFIX@ffffffffffffffff',
-          suffixes: suffixes << '13f7f01'
-        )
-        stub_request(:get, "http://#{score.host}:#{score.port}/remotes").to_return(
-          status: 200,
-          body: {
-            version: Zold::VERSION,
-            score: score.to_h,
-            all: [
-              { host: 'localhost', port: port }
-            ]
-          }.to_json
-        )
-        stub_request(:get, "http://localhost:#{port}/version").to_return(
-          status: 200,
-          body: {
-            version: Zold::VERSION
-          }.to_json
-        )
-        cmd.run(%W[remote add localhost #{port}])
-        remotes.rescore('localhost', port, score)
+      (1..11).each do |i|
+        cmd.run(%W[remote add localhost #{i} --skip-ping])
+        remotes.rescore('localhost', i, i)
       end
       cmd.run(%w[remote select --max-nodes=5])
       assert_equal(5, remotes.all.count)

data/test/node/test_front.rb

@@ -295,17 +295,15 @@ class FrontTest < Zold::Test
   end
 
   def test_headers_are_being_set_correctly
-    Time.stub :now, Time.at(0) do
-      FakeNode.new(log: test_log).run(['--expose-version=9.9.9', '--no-metronome', '--threads=0']) do |port|
-        response = Zold::Http.new(uri: URI("http://localhost:#{port}/")).get
-        assert_equal('no-cache', response.headers['Cache-Control'])
-        assert_equal('close', response.headers['Connection'])
-        assert_equal('9.9.9', response.headers['X-Zold-Version'])
-        assert_equal(app.settings.protocol.to_s, response.headers[Zold::Http::PROTOCOL_HEADER])
-        assert_equal('*', response.headers['Access-Control-Allow-Origin'])
-        assert(response.headers['X-Zold-Milliseconds'])
-        assert(!response.headers[Zold::Http::SCORE_HEADER].nil?)
-      end
+    FakeNode.new(log: test_log).run(['--expose-version=9.9.9', '--no-metronome', '--threads=0']) do |port|
+      response = Zold::Http.new(uri: URI("http://localhost:#{port}/")).get
+      assert_equal('no-cache', response.headers['Cache-Control'])
+      assert_equal('close', response.headers['Connection'])
+      assert_equal('9.9.9', response.headers['X-Zold-Version'])
+      assert_equal(app.settings.protocol.to_s, response.headers[Zold::Http::PROTOCOL_HEADER])
+      assert_equal('*', response.headers['Access-Control-Allow-Origin'])
+      assert(response.headers['X-Zold-Milliseconds'])
+      assert(!response.headers[Zold::Http::SCORE_HEADER].nil?)
     end
   end
 

data/test/test_tree_wallets.rb

@@ -57,4 +57,17 @@ class TestTreeWallets < Zold::Test
       assert_equal(10, wallets.all.count)
     end
   end
+
+  def test_count_tree_wallets
+    Dir.mktmpdir do |dir|
+      Dir.chdir(dir) do
+        5.times { |i| FileUtils.touch("wallet_#{i}.z") }
+        Dir.mktmpdir(nil, dir) do |subdir|
+          5.times { |i| FileUtils.touch("#{subdir}/wallet_#{i}.z") }
+          wallets = Zold::TreeWallets.new(Dir.pwd)
+          assert_equal(10, wallets.count)
+        end
+      end
+    end
+  end
 end

data/test/test_wallets.rb

@@ -67,4 +67,14 @@ class TestWallets < Zold::Test
       end
     end
   end
+
+  def test_count_wallets
+    Dir.mktmpdir do |dir|
+      Dir.chdir(dir) do
+        5.times { |i| FileUtils.touch("wallet_#{i}") }
+        wallets = Zold::Wallets.new(Dir.pwd)
+        assert_equal(5, wallets.count)
+      end
+    end
+  end
 end

data/zold.gemspec

@@ -85,7 +85,7 @@ and suggests a different architecture for digital wallet maintenance.'
   s.add_runtime_dependency 'usagewatch_ext', '0.2.1'
   s.add_runtime_dependency 'xcop', '0.6'
   s.add_runtime_dependency 'zache', '0.4.0'
-  s.add_runtime_dependency 'zold-score', '0.3.4'
+  s.add_runtime_dependency 'zold-score', '0.4.2'
   s.add_development_dependency 'codecov', '0.1.13'
   s.add_development_dependency 'minitest', '5.11.3'
   s.add_development_dependency 'minitest-fail-fast', '0.1.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.17.10
+  version: 0.18.0
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-05 00:00:00.000000000 Z
+date: 2018-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace
@@ -352,14 +352,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 0.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: codecov
   requirement: !ruby/object:Gem::Requirement
@@ -700,7 +700,7 @@ licenses:
 - MIT
 metadata: {}
 post_install_message: |-
-  Thanks for installing Zold 0.17.10!
+  Thanks for installing Zold 0.18.0!
     Study our White Paper: https://papers.zold.io/wp.pdf
     Read our blog posts: https://blog.zold.io
     Try online wallet at: https://wts.zold.io