zold 0.10.16 → 0.10.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 536093f30ee45d39b82fbc770313fce6128ac912
-  data.tar.gz: 24babf9751c618fd19ca6cb4ae0bcd1459995ff9
+  metadata.gz: f82eb3e8bbf86a83ea78315d7ecb2018ef1f6fcb
+  data.tar.gz: 9fc982bf05be569cb2bf9d1fe821fb6fcb9d1f53
 SHA512:
-  metadata.gz: d892b348b6b8b60e59d3543efc5d2634c33d8ca7083436df2295ba9de24ab06471fd926b722e701aa7593b4d85911598d32eb7546f82d27288dbe435923230ac
-  data.tar.gz: 79e9f411780263871b9c39d22d47a5a68cb8c6ba65b57f3fe3df538127e30031ec152e43ab33c21d1f91b290fc249d4aae1d53dd091c3a4ce34e0359ac212f4a
+  metadata.gz: 0df44ded0be61884ca4ceb84cc844bc20867abc8cc96a23ea510285ef6daabf371c1660423bcdd696ddbced6e0886318ad7b987f920703f032c8211b360c8fbe
+  data.tar.gz: d89ea78fff3c9e9f7c8434b93b29bf6532d224509f259db03212aafbbd0440ab52fca845a27c25a4b801054954cde3826bc1a6b2c66004b6a4835b706586ee32

data/README.md

@@ -106,6 +106,8 @@ to start the node and make sure it will be online even when you log off
 $ nohup bash -c 'while CMD; do gem install zold; done' &
 ```
 
+The software will update itself automatically to new versions.
+
 Grateful users of the system will pay "taxes" to your wallet
 for the maintenance of their wallets.
 

data/lib/zold/node/farm.rb

@@ -58,31 +58,31 @@ module Zold
 
     def start(host, port, strength: 8, threads: 8)
       @log.debug('Zero-threads farm won\'t score anything!') if threads.zero?
+      @best << Score.new(Time.now, host, port, @invoice, strength: strength)
       @scores = Queue.new
-      history(host, port, strength).each do |s|
-        @best << s
-        @scores << s
-      end
+      history.each { |s| @scores << s }
       @threads = (1..threads).map do |t|
         Thread.new do
           VerboseThread.new(@log).run do
             Thread.current.name = "farm-#{t}"
             loop do
+              if @scores.length < 4
+                @scores << Score.new(
+                  Time.now, host, port, @invoice,
+                  strength: strength
+                )
+              end
               s = @scores.pop
               next unless s.valid?
+              next if s.expired?
+              next if s.strength < strength
               @semaphore.synchronize do
+                save(s)
                 before = @best.map(&:value).max
                 @best << s
                 after = @best.map(&:value).max
                 @best.reject! { |b| b.value < after }
-                File.write(@cache, @best.map(&:to_s).join("\n"))
-                @log.debug("#{Thread.current.name}: best is #{@best[0]}") if before != after
-              end
-              if @scores.length < 4
-                @scores << Score.new(
-                  Time.now, host, port, @invoice,
-                  strength: strength
-                )
+                @log.debug("#{Thread.current.name}: best score is #{@best[0]}") if before != after
               end
               @scores << s.next
             end
@@ -102,11 +102,15 @@ module Zold
 
     private
 
-    def history(host, port, strength)
+    def save(score)
+      File.write(@cache, (history.reject(&:expired?) + [score]).map(&:to_s).join("\n"))
+    end
+
+    def history
       if File.exist?(@cache)
         File.readlines(@cache).map { |t| Score.parse(t) }
       else
-        [Score.new(Time.now, host, port, @invoice, strength: strength)]
+        []
       end
     end
   end

data/lib/zold/score.rb

@@ -65,17 +65,18 @@ module Zold
     end
 
     def self.parse(text)
-      m = Regexp.new(
+      re = Regexp.new(
         '^' + [
           '([0-9]+)/(?<strength>[0-9]+):',
-          '(?<time>[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z)',
-          '(?<host>[0-9a-z\.\-]+)',
-          '(?<port>[0-9]+)',
-          '(?<invoice>[a-zA-Z0-9]{8,32}@[a-f0-9]{16})',
-          '(?<suffixes>[a-zA-Z0-9 ]+)'
-        ].join(' ') + '$'
-      ).match(text)
-      raise "Invalid score '#{text}'" if m.nil?
+          ' (?<time>[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z)',
+          ' (?<host>[0-9a-z\.\-]+)',
+          ' (?<port>[0-9]+)',
+          ' (?<invoice>[a-zA-Z0-9]{8,32}@[a-f0-9]{16})',
+          '(?<suffixes>( [a-zA-Z0-9]+)*)'
+        ].join + '$'
+      )
+      m = re.match(text.strip)
+      raise "Invalid score '#{text}', doesn't match: #{re}" if m.nil?
       Score.new(
         Time.parse(m[:time]), m[:host],
         m[:port].to_i, m[:invoice],
@@ -136,7 +137,8 @@ module Zold
         time: @time.utc.iso8601,
         suffixes: @suffixes,
         strength: @strength,
-        hash: value.zero? ? nil : hash
+        hash: value.zero? ? nil : hash,
+        minutes: ((Time.now - @time) / 60).to_i
       }
     end
 

data/lib/zold/version.rb

@@ -23,5 +23,5 @@
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 module Zold
-  VERSION = '0.10.16'.freeze
+  VERSION = '0.10.17'.freeze
 end

data/test/node/test_farm.rb

@@ -21,13 +21,14 @@
 require 'minitest/autorun'
 require 'rack/test'
 require 'tmpdir'
+require_relative '../test__helper'
 require_relative '../../lib/zold/log'
 require_relative '../../lib/zold/node/farm'
 
 class FarmTest < Minitest::Test
   def test_makes_best_score_in_background
     Dir.mktmpdir 'test' do |dir|
-      farm = Zold::Farm.new('NOPREFIX@ffffffffffffffff', File.join(dir, 'f'))
+      farm = Zold::Farm.new('NOPREFIX@ffffffffffffffff', File.join(dir, 'f'), log: $log)
       farm.start('localhost', 80, threads: 4, strength: 2)
       sleep 0.1 while farm.best.empty? || farm.best[0].value.zero?
       assert(farm.best[0].value > 0)
@@ -37,7 +38,7 @@ class FarmTest < Minitest::Test
 
   def test_correct_score_from_empty_farm
     Dir.mktmpdir 'test' do |dir|
-      farm = Zold::Farm.new('NOPREFIX@cccccccccccccccc', File.join(dir, 'f'))
+      farm = Zold::Farm.new('NOPREFIX@cccccccccccccccc', File.join(dir, 'f'), log: $log)
       farm.start('example.com', 8080, threads: 0, strength: 1)
       score = farm.best[0]
       assert_equal(0, score.value)

data/test/test_score.rb

@@ -86,6 +86,17 @@ class TestScore < Minitest::Test
     assert(!score.expired?)
   end
 
+  def test_prints_and_parses_zero_score
+    time = Time.now
+    score = Zold::Score.parse(
+      Zold::Score.new(
+        time, '192.168.0.1', 1, 'NOPREFIX@ffffffffffffffff', []
+      ).to_s
+    )
+    assert_equal(0, score.value)
+    assert(!score.expired?)
+  end
+
   def test_finds_next_score
     score = Zold::Score.new(
       Time.now, 'localhost', 443,

data/test/test_verbose_thread.rb

@@ -0,0 +1,53 @@
+# 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 'minitest/autorun'
+require_relative 'test__helper'
+require_relative '../lib/zold/verbose_thread'
+
+# VerboseThread test.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2018 Yegor Bugayenko
+# License:: MIT
+class TestVerboseThread < Minitest::Test
+  def test_exceptions_are_logged
+    assert_raises RuntimeError do
+      Zold::VerboseThread.new(Zold::Log::Quiet.new).run do
+        raise 'Intentional'
+      end
+    end
+  end
+
+  def test_syntax_exceptions_are_logged
+    assert_raises NoMethodError do
+      Zold::VerboseThread.new(Zold::Log::Quiet.new).run do
+        this_method_doesnt_exist(1)
+      end
+    end
+  end
+
+  def test_grammar_exceptions_are_logged
+    assert_raises NameError do
+      Zold::VerboseThread.new(Zold::Log::Quiet.new).run do
+        the syntax is broken here
+      end
+    end
+  end
+end

data/wp/wp.tex

@@ -52,36 +52,36 @@ and suggests a different architecture for digital wallet maintenance.
 \section{Motivation}
 
 Bitcoin, the first decentralized digital currency, was released in January 2009~\parencite{nakamoto2008}.
-During a few following years ``a libertarian fairy tale'' and ``a simple Silicon Valley exercise in hype''
+In the following years ``a libertarian fairy tale'' and ``a simple Silicon Valley exercise in hype''
 turned into ``a catalyst to reshape the financial system in ways that are more
 powerful for individuals and businesses alike,'' according to \textcite{andreessen2014}.
 At the moment, as~\textcite{van2014} claimed, ``the question is not whether Bitcoin has value; it already does.
 The question is whether the efficiencies of a cybercurrency
 like Bitcoin can be merged with the certainties of an honest central bank.''
 
-The core component of Bitcoin is the Blockchain technology, which
+The core component of Bitcoin is Blockchain technology, which
 ``ensures the elimination of the double-spend problem, with the help
 of public-key cryptography'' and ``coins are transferred by the
 digital signature of a hash''~\parencite{pilkington2016}.
-Very soon after the Bitcoin invention similar products were introduced,
+Very soon after Bitcoin was created, similar products were introduced,
 which were also based on the principles of Blockchain, such as
 Etherium~\parencite{buterin2013}.
 
-Even though Blockchain is a sound solution of the double-spending
+Even though Blockchain is a sound solution to the double-spending
 problem, there could be other solutions,
 including different ``proof-of'' alternatives.%
 \footnote{%
   \url{https://goo.gl/aqzf2Q}:
   ``Proof-of-Burn'': instead of bringing the money together into computer equipment,
-  the owner burns the coins. Here the coins to the address where they are
+  the owner burns the coins by sending to an address where they are
   irretrievable. By doing this, the owner gets a privilege to
   mine on the system.
   ``Proof-of-Stake'': the coins exist from the start, and
   the validators get a reward in the form of transaction fees.
   ``Proof-Of-Capacity'': one pays with the hard drive space. The more
-  is the hard drive space; the more is the probability of mining
+  dedicated hard drive space, the higher probability of mining
   the next block and earning a reward.
-  ``Proof-of-Elapsed-Time'': one uses Trusted Execution Environment or TEE
+  ``Proof-of-Elapsed-Time'': one uses a Trusted Execution Environment or TEE
   to ensure a random looter production.
 }
 For example, \textcite{everaere2010} gave
@@ -90,11 +90,11 @@ a summary of them and introduced their own;
 ``a truly distributed ledger system based on a lean graph of cross-verifying transactions'';
 recently IOTA, a ``tangle-based cryptocurrency,'' was launched~\parencite{popov2017}.
 
-Zold also is a decentralized digital currency that maintains its ledgers
-at an unpredicable amount of anonymous and untrustable server nodes, trying to guarantee
+Zold is also a decentralized digital currency that maintains its ledgers
+through an unpredicable amount of anonymous and untrustable server nodes, trying to guarantee
 data consistency. The architecture of Zold is not Blockchain-based.
 The development of Zold was motivated by the desire to overcome
-two obvious disadvantages of the majority of all existing cryptocyrrencies:
+two obvious disadvantages present in the majority of all existing cryptocyrrencies:
 
 The first problem is that transaction processing is rather slow.%
 \footnote{%
@@ -121,7 +121,7 @@ Moreover, according to~\textcite{kaskaloglu2014},
 
 Thus, the speed is low and the processing fees are high.
 Zold was created as an attempt to resolve these two problems
-of existing Blockchain-based digital currencies.
+with existing Blockchain-based digital currencies.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.10.16
+  version: 0.10.17
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-01 00:00:00.000000000 Z
+date: 2018-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -367,6 +367,7 @@ files:
 - test/test_signature.rb
 - test/test_tax.rb
 - test/test_txn.rb
+- test/test_verbose_thread.rb
 - test/test_wallet.rb
 - test/test_wallets.rb
 - test/test_zold.rb
@@ -441,6 +442,7 @@ test_files:
 - test/test_signature.rb
 - test/test_tax.rb
 - test/test_txn.rb
+- test/test_verbose_thread.rb
 - test/test_wallet.rb
 - test/test_wallets.rb
 - test/test_zold.rb