zold 0.16.29 → 0.16.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c056002cff9a87ffe6f778a5177ffb939b91f06c509755fff6837709085c24db
-  data.tar.gz: e8a1593eb1356bc2252ba0b142d335a30b06447de722cecfd0699508689972c2
+  metadata.gz: 290d87dc57f2e51e44dffc3f55ca05fbcb9903988070583a5c074bd8482ee261
+  data.tar.gz: 59842e6f21d7c959b1e03900d971d7f1d193e2e16cb6eddb0e58d909bef06e9b
 SHA512:
-  metadata.gz: 4d098da93208df8f1698179e653504cccb907e8392f3fbcd88183e50a8e24cada09f54945cbe9f26fc6821d2555e2b73bcbea16f8fbe6e8ec4af7cc68f3b50d6
-  data.tar.gz: 9aaa767e15bf74b011c0c2e07b7e13b2f282fa16802beeafb508ebc045b8f3bc709a3d7ddf8b17b933bfdbb664af655ab2e16348b150086b6ffd4be5fa0cfda3
+  metadata.gz: '086dcfc48660670347ae67d832b3a915e96c67dc870abea06589e0d4a5156aca5adcf5abd028a123500ad6962a410abbd489fac6674c21b9de942fa292b4921c'
+  data.tar.gz: 48eeebe1591746a0d48f9ba65c644c83f5a621a6426500544e80f789bca0ac33895f67ae62d97e28ae117618956c24aa29971111c0daa86133c5485547811a58

data/lib/zold/commands/clean.rb

@@ -64,7 +64,7 @@ Available options:"
       deleted = cps.clean
       list = cps.all.map do |c|
         wallet = Wallet.new(c[:path])
-        "  #{c[:name]}: #{c[:score]} #{wallet.mnemo} \
+        "#{c[:name]}: #{c[:score]} #{wallet.mnemo} \
 #{Size.new(File.size(c[:path]))}/#{Age.new(File.mtime(c[:path]))}"
       end
       @log.debug(

data/lib/zold/commands/node.rb

@@ -23,6 +23,7 @@
 require 'open3'
 require 'slop'
 require 'backtrace'
+require 'zache'
 require 'concurrent'
 require 'zold/score'
 require_relative 'thread_badge'
@@ -119,6 +120,12 @@ module Zold
         o.bool '--routine-immediately',
           'Run all routines immediately, without waiting between executions (for testing mostly)',
           default: false
+        o.bool '--no-cache',
+          'Skip caching of front JSON pages (will seriously slow down, mostly useful for testing)',
+          default: false
+        o.integer '--queue-limit',
+          'The maximum number of wallets to be accepted via PUSH and stored in the queue (default: 4096)',
+          default: 4096
         o.string '--expose-version',
           "The version of the software to expose in JSON (default: #{VERSION})",
           default: VERSION
@@ -177,6 +184,7 @@ module Zold
       @log.info("Zold gem version: #{Zold::VERSION}")
       @log.info("Zold protocol version: #{Zold::PROTOCOL}")
       @log.info("Network ID: #{opts['network']}")
+      @log.info('Front caching is disabled via --no-cache') if opts['no-cache']
       host = opts[:host] || ip
       port = opts[:port]
       address = "#{host}:#{port}".downcase
@@ -192,6 +200,7 @@ module Zold
         Zold::Remote.new(remotes: @remotes).run(['remote', 'remove', host, port.to_s])
         @log.info("Removed current node (#{address}) from list of remotes")
       end
+      Front.set(:zache, Zache.new)
       Front.set(:wallets, @wallets)
       Front.set(:remotes, @remotes)
       Front.set(:copies, @copies)
@@ -229,7 +238,9 @@ module Zold
               log: @log,
               ignore_score_weakeness: opts['ignore-score-weakness']
             ),
-            File.join(home, '.zoldata/async-entrance'), log: @log
+            File.join(home, '.zoldata/async-entrance'),
+            log: @log,
+            queue_limit: opts['queue-limit']
           ),
           @wallets
         ),

data/lib/zold/commands/remote.rb

@@ -176,7 +176,9 @@ Available options:"
     end
 
     def defaults
-      @remotes.defaults
+      @remotes.defaults do |host, port|
+        !opts['ignore-node'].include?("#{host}:#{port}")
+      end
       @log.debug("Default remote nodes were added to the list, #{@remotes.all.count} total")
     end
 

data/lib/zold/http.rb

@@ -54,11 +54,11 @@ module Zold
     PROTOCOL_HEADER = 'X-Zold-Protocol'
 
     # Read timeout in seconds
-    READ_TIMEOUT = 1
+    READ_TIMEOUT = 2
     private_constant :READ_TIMEOUT
 
     # Connect timeout in seconds
-    CONNECT_TIMEOUT = 0.4
+    CONNECT_TIMEOUT = 0.8
     private_constant :CONNECT_TIMEOUT
 
     def initialize(uri:, score: Score::ZERO, network: 'test')

data/lib/zold/node/async_entrance.rb

@@ -36,12 +36,14 @@ require_relative '../dir_items'
 module Zold
   # The entrance
   class AsyncEntrance
-    def initialize(entrance, dir, log: Log::NULL, threads: [Concurrent.processor_count, 4].max)
+    def initialize(entrance, dir, log: Log::NULL,
+      threads: [Concurrent.processor_count, 8].max, queue_limit: 8)
       @entrance = entrance
       @dir = File.expand_path(dir)
       @log = log
       @total = threads
       @queue = Queue.new
+      @queue_limit = queue_limit
     end
 
     def to_json
@@ -78,7 +80,7 @@ module Zold
 
     # Always returns an array with a single ID of the pushed wallet
     def push(id, body)
-      raise "Queue is too long (#{@queue.size} wallets), try again later" if @queue.size > 256
+      raise "Queue is too long (#{@queue.size} wallets), try again later" if @queue.size > @queue_limit
       start = Time.now
       loop do
         uuid = SecureRandom.uuid

data/lib/zold/node/front.rb

@@ -72,7 +72,7 @@ module Zold
       set :remotes, nil # to be injected at node.rb
       set :copies, nil # to be injected at node.rb
       set :node_alias, nil # to be injected at node.rb
-      set :zache, Zache.new
+      set :zache, nil # to be injected at node.rb
     end
     use Rack::Deflater
 
@@ -435,17 +435,19 @@ in #{Age.new(@start, limit: 1)}")
     #  we must find a way to count them somehow faster.
     def total_wallets
       return 256 if settings.opts['network'] == Wallet::MAINET
-      settings.wallets.all.count
+      settings.zache.get(:wallets, lifetime: settings.opts['no-cache'] ? 0 : 60) do
+        settings.wallets.all.count
+      end
     end
 
     def all_remotes
-      settings.zache.get(:remotes, lifetime: settings.opts['network'] == Wallet::MAINET ? 60 : 0) do
+      settings.zache.get(:remotes, lifetime: settings.opts['no-cache'] ? 0 : 60) do
         settings.remotes.all
       end
     end
 
     def processes_count
-      settings.zache.get(:processes, lifetime: settings.opts['network'] == Wallet::MAINET ? 60 : 0) do
+      settings.zache.get(:processes, lifetime: settings.opts['no-cache'] ? 0 : 60) do
         processes.count
       end
     end
@@ -459,7 +461,7 @@ in #{Age.new(@start, limit: 1)}")
     end
 
     def score
-      settings.zache.get(:score, lifetime: settings.opts['network'] == Wallet::MAINET ? 60 : 0) do
+      settings.zache.get(:score, lifetime: settings.opts['no-cache'] ? 0 : 60) do
         b = settings.farm.best
         raise 'Score is empty, there is something wrong with the Farm!' if b.empty?
         b[0]

data/lib/zold/remotes.rb

@@ -128,7 +128,7 @@ module Zold
     end
 
     def all
-      list = load
+      list = Futex.new(@file).open(false) { load }
       max_score = list.map { |r| r[:score] }.max || 0
       max_score = 1 if max_score.zero?
       max_errors = list.map { |r| r[:errors] }.max || 0
@@ -144,6 +144,9 @@ module Zold
 
     def defaults
       DEFS.each do |r|
+        if block_given?
+          next unless yield(r[0], r[1].to_i)
+        end
         add(r[0], r[1].to_i)
       end
     end
@@ -152,7 +155,8 @@ module Zold
       raise 'Port has to be of type Integer' unless port.is_a?(Integer)
       raise 'Host can\'t be nil' if host.nil?
       raise 'Port can\'t be nil' if port.nil?
-      !load.find { |r| r[:host] == host.downcase && r[:port] == port }.nil?
+      list = Futex.new(@file).open(false) { load }
+      !list.find { |r| r[:host] == host.downcase && r[:port] == port }.nil?
     end
 
     def add(host, port = PORT)
@@ -240,8 +244,20 @@ module Zold
     private
 
     def modify
-      Futex.new(@file).open do
-        save(yield(load))
+      FileUtils.mkdir_p(File.dirname(@file))
+      Futex.new(@file).open(true) do
+        list = yield(load)
+        IO.write(
+          @file,
+          list.uniq { |r| "#{r[:host]}:#{r[:port]}" }.map do |r|
+            [
+              r[:host],
+              r[:port],
+              r[:score],
+              r[:errors]
+            ].join(',')
+          end.join("\n")
+        )
       end
     end
 
@@ -273,20 +289,5 @@ module Zold
         []
       end
     end
-
-    def save(list)
-      FileUtils.mkdir_p(File.dirname(@file))
-      IO.write(
-        @file,
-        list.uniq { |r| "#{r[:host]}:#{r[:port]}" }.map do |r|
-          [
-            r[:host],
-            r[:port],
-            r[:score],
-            r[:errors]
-          ].join(',')
-        end.join("\n")
-      )
-    end
   end
 end

data/lib/zold/version.rb

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

data/test/node/test_front.rb

@@ -112,7 +112,7 @@ class FrontTest < Zold::Test
   end
 
   def test_updates_list_of_remotes
-    FakeNode.new(log: test_log).run(['--ignore-score-weakness']) do |port|
+    FakeNode.new(log: test_log).run(['--ignore-score-weakness', '--no-cache']) do |port|
       score = Zold::Score.new(
         host: 'localhost', port: port, invoice: 'NOPREFIX@ffffffffffffffff', strength: 1
       ).next.next.next.next
@@ -128,7 +128,7 @@ class FrontTest < Zold::Test
   end
 
   def test_increments_score
-    FakeNode.new(log: test_log).run(['--threads=1', '--strength=1', '--no-metronome']) do |port|
+    FakeNode.new(log: test_log).run(['--threads=1', '--strength=1', '--no-metronome', '--no-cache']) do |port|
       3.times do |i|
         assert_equal_wait(true) do
           response = Zold::Http.new(uri: "http://localhost:#{port}/").get

data/test/test__helper.rb

@@ -50,6 +50,7 @@ module Zold
     # in order to catch problems ealier.
     def around
       Timeout.timeout(120) do
+        Thread.current.name = 'test'
         super
       end
     end

data/test/test_remotes.rb

@@ -200,8 +200,12 @@ class TestRemotes < Zold::Test
     Dir.mktmpdir do |dir|
       remotes = Zold::Remotes.new(file: File.join(dir, 'xx.csv'))
       remotes.clean
-      Threads.new(10).assert(100) do |_, r|
-        remotes.add('127.0.0.1', 8080 + r)
+      host = '127.0.0.1'
+      Threads.new(2).assert(100) do |_, r|
+        port = 8080 + r
+        remotes.add(host, port)
+        remotes.error(host, port)
+        assert(remotes.all.find { |x| x[:port] == port })
       end
       assert_equal(100, remotes.all.count)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.16.29
+  version: 0.16.30
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -697,7 +697,7 @@ licenses:
 - MIT
 metadata: {}
 post_install_message: |-
-  Thanks for installing Zold 0.16.29!
+  Thanks for installing Zold 0.16.30!
     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