zold 0.19.1 → 0.19.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a31487e8700a8c5b7c346e82df8f142931e471a37292df407067320a6a095e9
-  data.tar.gz: ffb06dbf75783b9be9c7b02271bdb5a1a1a70a74b61909cb52f82b24d7ac6ab3
+  metadata.gz: 32709fc443bc01bdd90a978c9cc7204fd8d6758466a46dbecb5c811bd2a40a12
+  data.tar.gz: cd4fe030458935e3ec27db1673289d3b1dbdf63989b027ea50bf8f336fcab49f
 SHA512:
-  metadata.gz: 78ded3b0ff00af5ccf51e31d68e5e8593f3a1c0ee5851a3b051ee77b29e9abad1b672f9daca870bcc6805f0089db89c12c92b791d6cdbecc393db0ac9dc607bc
-  data.tar.gz: b7e0bcdf1b27eaefe1ddb141538f0b01a001cdfe3128056c1620c7f8201d6e72e21f0623a7d3c044a08bc1d8ec64e5a8ed067ef9d2267372ebd226d9fa86fd5b
+  metadata.gz: c7b3009e694c98f2dd296d888191b2060cd222e19d621bda1cb457941b5167257149d6c9e7c1ea9645cb221b1c8014fc8d7f44574fcbcecd9a731a204ec5c4ba
+  data.tar.gz: 30a9c25381547e573a6908412465311c7477314d085100d17fe3ca4baa4289e42196fc62bfdd6565998b36b6d773f3c17bd074c9e0dd2d74e4be83f1590ca9a9

data/heroku-run.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
 
-./bin/zold node --no-colors --trace --dump-errors \
+./bin/zold node --no-colors --trace --dump-errors --skip-oom \
     --bind-port=$PORT --port=80 --host=b1.zold.io --threads=0 \
     --invoice=ML5Ern7m@912ecc24b32dbe74 --never-reboot

data/lib/zold/commands/fetch.rb

@@ -99,6 +99,7 @@ Available options:"
     private
 
     def fetch(id, cps, opts)
+      raise "There are no remote nodes, run 'zold remote reset'" if @remotes.all.empty?
       start = Time.now
       total = Concurrent::AtomicFixnum.new
       nodes = Concurrent::AtomicFixnum.new
@@ -110,14 +111,14 @@ Available options:"
         masters.increment if r.master?
         done.increment
       end
-      raise "There are no remote nodes, run 'zold remote reset'" if nodes.value.zero?
       unless opts['quiet-if-absent']
         raise "No nodes out of #{nodes.value} have the wallet #{id}" if done.value.zero?
         if masters.value.zero? && !opts['tolerate-edges']
-          raise EdgesOnly, "There are only edge nodes, run 'zold remote reset' or use --tolerate-edges"
+          raise EdgesOnly, "There are only edge nodes, run 'zold remote update' or use --tolerate-edges"
         end
         if nodes.value < opts['tolerate-quorum']
-          raise NoQuorum, "There were not enough nodes, run 'zold remote reset' or use --tolerate-quorum=1"
+          raise NoQuorum, "There were not enough nodes, the required quorum is #{opts['tolerate-quorum']}; \
+run 'zold remote update' or use --tolerate-quorum=1"
         end
       end
       @log.info("#{done.value} copies of #{id} fetched in #{Age.new(start)} with the total score of \

data/lib/zold/commands/push.rb

@@ -91,25 +91,26 @@ Available options:"
     private
 
     def push(id, opts)
+      raise "There are no remote nodes, run 'zold remote reset'" if @remotes.all.empty?
+      start = Time.now
       total = Concurrent::AtomicFixnum.new
       nodes = Concurrent::AtomicFixnum.new
       done = Concurrent::AtomicFixnum.new
       masters = Concurrent::AtomicFixnum.new
-      start = Time.now
       @remotes.iterate(@log) do |r|
         nodes.increment
         total.increment(push_one(id, r, opts))
         masters.increment if r.master?
         done.increment
       end
-      raise "There are no remote nodes, run 'zold remote reset'" if nodes.value.zero?
       unless opts['quiet-if-missed']
         raise "No nodes out of #{nodes} accepted the wallet #{id}" if done.value.zero?
         if masters.value.zero? && !opts['tolerate-edges']
-          raise EdgesOnly, "There are only edge nodes, run 'zold remote reset' or use --tolerate-edges"
+          raise EdgesOnly, "There are only edge nodes, run 'zold remote update' or use --tolerate-edges"
         end
         if nodes.value < opts['tolerate-quorum']
-          raise NoQuorum, "There were not enough nodes, run 'zold remote reset' or use --tolerate-quorum=1"
+          raise NoQuorum, "There were not enough nodes, the required quorum is #{opts['tolerate-quorum']}; \
+run 'zold remote update' or use --tolerate-quorum=1"
         end
       end
       @log.info("Push finished to #{done.value} nodes (#{masters.value} master nodes) \

data/lib/zold/commands/remote.rb

@@ -107,7 +107,7 @@ Available options:"
           default: false
         o.integer '--depth',
           'The amount of update cycles to run, in order to fetch as many nodes as possible (default: 2)',
-          default: 2
+          default: 3
         o.string '--network',
           "The name of the network we work in (default: #{Wallet::MAINET}",
           required: true,

data/lib/zold/commands/show.rb

@@ -28,6 +28,9 @@ require_relative '../log'
 require_relative '../id'
 require_relative '../amount'
 require_relative '../wallet'
+require_relative '../tax'
+require_relative '../size'
+require_relative '../age'
 
 # SHOW command.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -72,9 +75,17 @@ Available options:"
       wallet.txns.each do |t|
         @log.info(t.to_text)
       end
-      msg = "The balance of #{wallet}: #{balance}"
-      msg += " (net:#{wallet.network})" if wallet.network != Wallet::MAINET
-      @log.info(msg)
+      @log.info(
+        [
+          "The balance of #{wallet}: #{balance} (#{balance.to_i} zents)",
+          "Network: #{wallet.network}",
+          "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(@copies, wallet.id)).all.count} copies",
+          "Modified: #{wallet.mtime.utc.iso8601} (#{Age.new(wallet.mtime.utc.iso8601)} ago)",
+          "Digest: #{wallet.digest}"
+        ].join("\n")
+      )
       balance
     end
   end

data/lib/zold/hungry_wallets.rb

@@ -24,6 +24,7 @@ require 'delegate'
 require_relative 'log'
 require_relative 'thread_pool'
 require_relative 'commands/pull'
+require_relative 'commands/fetch'
 
 # Wallets that PULL what's missing, in the background.
 #
@@ -41,31 +42,45 @@ module Zold
       @log = log
       @network = network
       @pool = pool
-      @queue = Queue.new
+      @queue = []
+      @mutex = Mutex.new
       @pool.add do
-        Endless.new('hungry', log: log).run do
-          id = @queue.pop
-          Pull.new(wallets: @wallets, remotes: @remotes, copies: @copies, log: @log).run(
-            ['pull', id.to_s, "--network=#{@network}"]
-          )
-        rescue Pull::EdgesOnly => e
-          @log.error("Can't hungry-pull #{id}: #{e.message}")
-        end
+        Endless.new('hungry', log: log).run { pull }
       end
       super(wallets)
     end
 
     def acq(id, exclusive: false)
       @wallets.acq(id, exclusive: exclusive) do |wallet|
-        unless wallet.exists?
-          if @queue.size > 256
-            @log.error("Hungry queue is full with #{@queue.size} wallets, can't add #{id}")
-          else
-            @queue << id
+        if @queue.size > 256
+          @log.error("Hungry queue is full with #{@queue.size} wallets, can't add #{id}")
+        else
+          @mutex.synchronize do
+            unless @queue.include?(id)
+              @queue << id
+              @log.debug("Hungry queue got #{id}, at the pos no.#{@queue.size}")
+            end
           end
         end
         yield wallet
       end
     end
+
+    private
+
+    def pull
+      id = @mutex.synchronize { @queue.pop }
+      if id.nil?
+        sleep 1
+        return
+      end
+      begin
+        Pull.new(wallets: @wallets, remotes: @remotes, copies: @copies, log: @log).run(
+          ['pull', id.to_s, "--network=#{@network}"]
+        )
+      rescue Fetch::EdgesOnly => e
+        @log.error("Can't hungry-pull #{id}: #{e.message}")
+      end
+    end
   end
 end

data/lib/zold/thread_pool.rb

@@ -94,18 +94,23 @@ module Zold
       @log.debug("Stopping \"#{@title}\" thread pool with #{@threads.count} threads: \
 #{@threads.map { |t| "#{t.name}/#{t.status}" }.join(', ')}...")
       start = Time.new
-      @threads.each do |t|
-        (t.thread_variable_get(:kids) || []).each(&:kill)
-        t.kill
-        raise "Failed to join the thread \"#{t.name}\" in \"#{@title}\" pool" unless t.join(0.1)
-        Thread.current.thread_variable_set(
-          :kids,
-          (Thread.current.thread_variable_get(:kids) || []) - [t]
-        )
-      end
-      @log.debug("Thread pool \"#{@title}\" terminated all threads in #{Age.new(start)}, \
+      begin
+        @threads.each do |t|
+          t.join(0.1)
+        end
+      ensure
+        @threads.each do |t|
+          (t.thread_variable_get(:kids) || []).each(&:kill)
+          t.kill
+          Thread.current.thread_variable_set(
+            :kids,
+            (Thread.current.thread_variable_get(:kids) || []) - [t]
+          )
+        end
+        @log.debug("Thread pool \"#{@title}\" terminated all threads in #{Age.new(start)}, \
 it was alive for #{Age.new(@start)}: #{@threads.map { |t| "#{t.name}/#{t.status}" }.join(', ')}")
-      @threads.clear
+        @threads.clear
+      end
     end
 
     # How many threads are in there

data/lib/zold/version.rb

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

data/test/test_hungry_wallets.rb

@@ -46,7 +46,7 @@ class TestHungryWallets < Zold::Test
         pool, log: test_log
       )
       wallets.acq(id) { |w| assert(!w.exists?) }
-      pool.join(1)
+      pool.join(2)
       assert_requested(get)
     end
   end

data/test/test_thread_pool.rb

@@ -71,8 +71,11 @@ class TestThreadPool < Zold::Test
 
   def test_runs_with_exceptions
     assert_raises do
-      Zold::ThreadPool.new('test', log: test_log).run(1) do
-        raise 'intended'
+      Zold::ThreadPool.new('test', log: test_log).run(5) do |i|
+        if i == 4
+          sleep 0.1
+          raise 'intended'
+        end
       end
     end
   end

metadata

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