zold 0.16.8 → 0.16.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1399da979b61a827097b2b29a04b31920f6da3a65e2af8920fc493bbb52064ba
-  data.tar.gz: 255d50d0c687709e5b15f1ce1fc17eec7ab656b24a7c8356aec320d8620d911c
+  metadata.gz: 5fa4b6ced7df2e9773120703da57a11e317396caedc756a8b42d9316fb900ff7
+  data.tar.gz: e1e4f91dda7d2954bb7cb34adf5f56b71202ebe59102a7a85a805e4425041be0
 SHA512:
-  metadata.gz: acf61ff6782dcb26a24f17f2f208cf64d7110c1204ccb048240433541c99978f298f21de0c96974aa7c67321acf800131e80a518d5eef37709c714e7642c1c41
-  data.tar.gz: d0816cade1db2f054b08a321aa7bde96a6af4eb3beb8ea42d54ba3d66b88c254464d48809e3a7e1fca80a155653420f21c779f93a2db1b7c255b38e652448187
+  metadata.gz: f5b2ccce4eec666e4036448517f18ee4e36e71637100b85d900536891bf7e04306b5e7fd764037df5616b07998526b472759f9aa873874ffedaa640256217b2f
+  data.tar.gz: 16287fd3da5be69b02e5d3ef232ca18eaa6cd1dafaeafbbe07ec3d4fc98f34e21f23fcd867591b19f5fe18ff6302a66aba3901432d8781fe672c82ef283d2f56

data/INSTALL.md

@@ -14,6 +14,8 @@ We recommend to host nodes at
 [AWS](https://aws.amazon.com/) or
 [DigitalOcean](https://www.digitalocean.com/).
 
+It is recommended to have at least 2 CPUs and 2 Gb RAM.
+
 ## Debian 9.4
 
 ```bash
@@ -48,9 +50,9 @@ Without homebrew:
 
 ## Windows
 
-Download and install [RubyInstaller (with Devkit)](https://rubyinstaller.org/downloads/).  
-If Windows Defender (or antivirus software) throws an error, ignore it and allow the file. This file is known to trigger [false positives](https://groups.google.com/forum/#!topic/rubyinstaller/LCR-CbBoGOI).  
-Download and install [RubyGems](https://rubygems.org/pages/download). Manual install `ruby setup.rb` works.  
+Download and install [RubyInstaller (with Devkit)](https://rubyinstaller.org/downloads/).
+If Windows Defender (or antivirus software) throws an error, ignore it and allow the file. This file is known to trigger [false positives](https://groups.google.com/forum/#!topic/rubyinstaller/LCR-CbBoGOI).
+Download and install [RubyGems](https://rubygems.org/pages/download). Manual install `ruby setup.rb` works.
 Install [Zold gem](https://rubygems.org/gems/zold) `gem install --no-ri --no-rdoc zold`
 
 ## CentOS 7.5

data/lib/zold/commands/clean.rb

@@ -68,8 +68,8 @@ Available options:"
 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]))}"
+            "  #{c[:name]}: #{c[:score]} #{wallet.memo} \
+#{Size.new(File.size(c[:path]))}/#{Age.new(File.mtime(c[:path]))}"
           end.join("\n")
         )
       end

data/lib/zold/commands/fetch.rb

@@ -93,8 +93,8 @@ Available options:"
       @log.debug("#{cps.all.count} local copies:")
       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]))}")
+        @log.debug("  #{c[:name]}: #{c[:score]} #{wallet.memo} \
+#{Size.new(File.size(c[:path]))}/#{Age.new(File.mtime(c[:path]))}")
       end
     end
 
@@ -128,7 +128,7 @@ Available options:"
           raise "The balance of #{id} is #{wallet.balance} and it's not a root wallet"
         end
         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/\
+        @log.info("#{r} returned #{Size.new(body.length)} #{wallet.memo} \
 #{digest(json)}/#{Age.new(json['mtime'])}/#{json['copies']}c \
 as copy #{copy} of #{id} in #{Age.new(start, limit: 4)}: #{Rainbow(score.value).green} (#{json['version']})")
       end

data/lib/zold/commands/list.rb

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

data/lib/zold/commands/merge.rb

@@ -88,7 +88,7 @@ Available options:"
         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, limit: 0.1 + cps.count * 0.01)}")
+into #{wallet.memo} 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/pay.rb

@@ -114,18 +114,10 @@ Available options:"
       @log.debug("#{amount} sent from #{from} to #{txn.bnf}: #{details}")
       @log.debug("Don't forget to do 'zold push #{from}'")
       @log.info(txn.id)
-      notify_of_tax_debt(from)
+      tax = Tax.new(from)
+      @log.info("The tax debt of #{from.memo} is #{tax.debt} \
+(#{tax.in_debt? ? 'too high' : 'still acceptable'})")
       txn
     end
-
-    # @todo #79:40min Extract message cretion into a separate method for easier
-    #  testing. Add tests for when in debt and not. Extract to a
-    #  module, possibly Notify.
-    def notify_of_tax_debt(wallet)
-      tax = Tax.new(wallet)
-      message = "The tax debt of #{wallet} is #{tax.debt}"
-      message += ' (still acceptable)' unless tax.in_debt?
-      @log.info(message)
-    end
   end
 end

data/lib/zold/commands/push.rb

@@ -95,8 +95,8 @@ total score for #{id} is #{total}")
       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, limit: 0.5)}")
+          @log.info("#{r}: same version #{Size.new(content.length)} of #{wallet.memo} \
+there, in #{Age.new(start, limit: 0.5)}")
           return 0
         end
         r.assert_code(200, response)
@@ -105,8 +105,8 @@ of #{wallet.id} there, in #{Age.new(start, limit: 0.5)}")
         r.assert_valid_score(score)
         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, limit: 4)}: #{Rainbow(score.value).green} (#{json['version']})")
+        @log.info("#{r} accepted #{Size.new(content.length)} of #{wallet.memo} \
+in #{Age.new(start, limit: 4)}: #{Rainbow(score.value).green} (#{json['version']})")
         score.value
       end
     end

data/lib/zold/commands/taxes.rb

@@ -115,7 +115,7 @@ Available options:"
       raise 'The wallet is absent' unless wallet.exists?
       tax = Tax.new(wallet)
       debt = total = tax.debt
-      @log.info("The current debt of #{wallet.id}/#{wallet.txns.count}t is #{debt} (#{debt.to_i} zents), \
+      @log.info("The current debt of #{wallet.memo} is #{debt} (#{debt.to_i} zents), \
 the balance is #{wallet.balance}: #{tax.to_text}")
       unless tax.in_debt?
         @log.debug("No need to pay taxes yet, while the debt is less than #{Tax::TRIAL} (#{Tax::TRIAL.to_i} zents)")
@@ -144,7 +144,8 @@ the balance is #{wallet.balance}: #{tax.to_text}")
         txn = tax.pay(Zold::Key.new(file: opts['private-key']), best)
         debt += txn.amount
         paid += 1
-        @log.info("#{txn.amount} of taxes paid to #{txn.bnf} (payment no.#{paid}), #{debt} left to pay")
+        @log.info("#{txn.amount * -1} of taxes paid from #{wallet.id} to #{txn.bnf} \
+(payment no.#{paid}, txn ##{txn.id}/#{wallet.txns.count}), #{debt} left to pay")
       end
       @log.info('The wallet is in good standing, all taxes paid') unless tax.in_debt?
     end

data/lib/zold/node/entrance.rb

@@ -91,7 +91,7 @@ module Zold
         @history.shift if @history.length >= 16
         @speed.shift if @speed.length >= 64
         @wallets.find(id) do |wallet|
-          @history << "#{id}/#{sec}/#{modified.count}/#{wallet.balance.to_zld}/#{wallet.txns.count}t"
+          @history << "#{id}/#{sec}/#{modified.count}/#{wallet.memo}"
         end
         @speed << sec
       end

data/lib/zold/node/farm.rb

@@ -62,6 +62,7 @@ module Zold
     def to_text
       [
         "Current time: #{Time.now.utc.iso8601}",
+        "Ruby processes: #{`ps -a | grep zold | wc -l`}",
         JSON.pretty_generate(to_json),
         @threads.map do |t|
           trace = t.backtrace || []

data/lib/zold/node/front.rb

@@ -326,8 +326,8 @@ in #{Age.new(@start, limit: 1)}")
         "\n\n" +
         copies.all.map do |c|
           w = Wallet.new(c[:path])
-          "#{c[:name]}: #{c[:score]} #{w.balance}/#{w.txns.count}t/\
-#{w.digest[0, 6]}/#{Size.new(File.size(c[:path]))}/#{Age.new(File.mtime(c[:path]))}"
+          "#{c[:name]}: #{c[:score]} #{w.memo} \
+#{Size.new(File.size(c[:path]))}/#{Age.new(File.mtime(c[:path]))}"
         end.join("\n")
       end
     end

data/lib/zold/node/nodup_entrance.rb

@@ -64,7 +64,7 @@ module Zold
         end
         if before == after
           @log.info(
-            "Duplicate of #{id}/#{wallet.digest[0, 6]}/#{Size.new(after.length)}/#{wallet.txns.count}t ignored"
+            "Duplicate of #{Size.new(after.length)} #{wallet.memo} ignored"
           )
           return []
         end

data/lib/zold/node/safe_entrance.rb

@@ -75,7 +75,8 @@ module Zold
         Emission.new(wallet).check
         tax = Tax.new(wallet)
         if tax.in_debt?
-          raise "Taxes are not paid, can't accept the wallet; the debt is #{tax.debt} (#{tax.debt.to_i} zents)"
+          raise "Taxes are not paid, can't accept the wallet #{wallet.memo}; the debt is #{tax.debt} \
+(#{tax.debt.to_i} zents); formula ingredients are #{tax.to_text}"
         end
         @entrance.push(id, body)
       end

data/lib/zold/tax.rb

@@ -40,7 +40,7 @@ module Zold
     # The correct amount should be 1 ZLD, but we allow bigger amounts
     # now since the amount of nodes in the network is still small. When
     # the network grows up, let's put this number back to 1 ZLD.
-    MAX_PAYMENT = Amount.new(zld: 64.0)
+    MAX_PAYMENT = Amount.new(zld: 16.0)
 
     # This is how much we charge per one transaction per hour
     # of storage. A wallet of 4096 transactions will pay
@@ -56,9 +56,10 @@ module Zold
     # Text prefix for taxes details
     PREFIX = 'TAXES'
 
-    def initialize(wallet)
+    def initialize(wallet, ignore_score_weakness: false)
       raise "The wallet must be of type Wallet: #{wallet.class.name}" unless wallet.is_a?(Wallet)
       @wallet = wallet
+      @ignore_score_weakness = ignore_score_weakness
     end
 
     # Check whether this tax payment already exists in the wallet.
@@ -71,7 +72,7 @@ module Zold
     end
 
     def pay(pvt, best)
-      @wallet.sub(Tax::MAX_PAYMENT, best.invoice, pvt, details(best))
+      @wallet.sub([Tax::MAX_PAYMENT, debt].min, best.invoice, pvt, details(best))
     end
 
     def in_debt?
@@ -93,11 +94,11 @@ module Zold
         next if pfx != Tax::PREFIX || body.nil?
         score = Score.parse_text(body)
         next if !score.valid? || score.value != Tax::EXACT_SCORE
-        next if score.strength < Score::STRENGTH
+        next if score.strength < Score::STRENGTH && !@ignore_score_weakness
         next if t.amount > Tax::MAX_PAYMENT
         t
       end.compact.uniq(&:details)
-      scored.empty? ? Amount::ZERO : scored.map(&:amount).inject(&:+)
+      scored.empty? ? Amount::ZERO : scored.map(&:amount).inject(&:+) * -1
     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.8'
+  VERSION = '0.16.9'
   PROTOCOL = 2
 end

data/lib/zold/wallet.rb

@@ -32,6 +32,7 @@ require_relative 'amount'
 require_relative 'hexnum'
 require_relative 'signature'
 require_relative 'txns'
+require_relative 'size'
 require_relative 'head'
 
 # The wallet.
@@ -70,6 +71,10 @@ module Zold
       id.to_s
     end
 
+    def memo
+      "#{id}/#{balance.to_zld(4)}/#{txns.count}t/#{digest[0, 6]}/Size.new(File.size(@file))}"
+    end
+
     def to_text
       (@head.fetch + [''] + @txns.fetch.map(&:to_text)).join("\n")
     end

data/test/commands/test_taxes.rb

@@ -42,14 +42,16 @@ class TestTaxes < Minitest::Test
       wallets = home.wallets
       wallet = home.create_wallet
       fund = Zold::Amount.new(zld: 19.99)
-      wallet.add(
-        Zold::Txn.new(
-          1,
-          Time.now - 24 * 60 * 60 * 365 * 300,
-          fund,
-          'NOPREFIX', Zold::Id.new, '-'
+      10.times do |i|
+        wallet.add(
+          Zold::Txn.new(
+            i + 1,
+            Time.now - 24 * 60 * 60 * 365 * 300,
+            fund,
+            'NOPREFIX', Zold::Id.new, '-'
+          )
         )
-      )
+      end
       remotes = home.remotes
       score = Zold::Score.new(host: 'localhost', port: 80, strength: 1, invoice: 'NOPREFIX@0000000000000000')
       Zold::Tax::EXACT_SCORE.times { score = score.next }
@@ -60,25 +62,15 @@ class TestTaxes < Minitest::Test
           score: score.to_h
         }.to_json
       )
+      before = wallet.balance
+      tax = Zold::Tax.new(wallet, ignore_score_weakness: true)
+      debt = tax.debt
       Zold::Taxes.new(wallets: wallets, remotes: remotes, log: test_log).run(
         ['taxes', '--private-key=fixtures/id_rsa', '--ignore-score-weakness', 'pay', wallet.id.to_s]
       )
-      assert_equal(fund - Zold::Tax::MAX_PAYMENT, wallet.balance)
-      wallet.add(
-        Zold::Txn.new(
-          2,
-          Time.now - 24 * 60 * 60 * 365 * 300,
-          fund,
-          'NOPREFIX', Zold::Id.new, '-'
-        )
-      )
-      Zold::Taxes.new(wallets: wallets, remotes: remotes, log: test_log).run(
-        [
-          'taxes', '--private-key=fixtures/id_rsa', '--ignore-score-weakness',
-          '--ignore-nodes-absence', 'pay', wallet.id.to_s
-        ]
-      )
-      assert_equal(fund + fund - Zold::Tax::MAX_PAYMENT, wallet.balance)
+      wallet.flush
+      assert(tax.paid.positive?, tax.paid)
+      assert_equal(before - debt, wallet.balance)
     end
   end
 end

data/test/node/fake_node.rb

@@ -63,11 +63,14 @@ class FakeNode
           end
         end
         uri = "http://localhost:#{port}/"
+        attempt = 0
         loop do
           ping = Zold::Http.new(uri: uri, network: Zold::Front.network).get
           break unless ping.code == '599' && node.alive?
-          @log.debug("Waiting for #{uri}: ##{ping.code}...")
+          @log.debug("Waiting for #{uri} (attempt no.#{attempt}): ##{ping.code}...")
           sleep 0.5
+          attempt += 1
+          break if attempt > 10
         end
         raise "The node is dead at #{uri}" unless node.alive?
         begin

data/test/test_dir_items.rb

@@ -35,7 +35,7 @@ class TestDirItems < Minitest::Test
   def test_intensive_write_in_threads
     Dir.mktmpdir do |dir|
       file = File.join(dir, 'hey.txt')
-      Thread.start do
+      back = Thread.start do
         loop do
           Zold::DirItems.new(dir).fetch
         end
@@ -48,6 +48,7 @@ class TestDirItems < Minitest::Test
         test_log.debug("Saved in #{Zold::Age.new(start)}")
         sleep 1
       end
+      back.kill
     end
   end
 

data/test/test_tax.rb

@@ -77,8 +77,9 @@ class TestTax < Minitest::Test
         suffixes: %w[A B C D E F G H I J K L M N O P Q R S T U V]
       )
       tax = Zold::Tax.new(wallet)
+      debt = tax.debt
       txn = tax.pay(Zold::Key.new(file: 'fixtures/id_rsa'), score)
-      assert_equal(Zold::Tax::MAX_PAYMENT * -1, txn.amount)
+      assert_equal(debt, txn.amount * -1)
     end
   end
 
@@ -93,18 +94,20 @@ class TestTax < Minitest::Test
   def test_takes_tax_payment_into_account
     FakeHome.new(log: test_log).run do |home|
       wallet = home.create_wallet
+      amount = Zold::Amount.new(zents: 95_596_800)
       wallet.add(
         Zold::Txn.new(
           1,
           Time.now,
-          Zold::Amount.new(zents: 95_596_800),
+          amount * -1,
           'NOPREFIX', Zold::Id.new('912ecc24b32dbe74'),
           "TAXES 6 5b5a21a9 b2.zold.io 1000 DCexx0hG 912ecc24b32dbe74 \
 386d4a ec9eae 306e3d 119d073 1c00dba 1376703 203589 5b55f7"
         )
       )
       tax = Zold::Tax.new(wallet)
-      assert(tax.debt < Zold::Amount::ZERO)
+      assert_equal(amount, tax.paid)
+      assert(tax.debt < Zold::Amount::ZERO, tax.debt)
     end
   end
 

data/test/test_wallet.rb

@@ -43,6 +43,13 @@ class TestWallet < Minitest::Test
     end
   end
 
+  def test_generates_memo
+    FakeHome.new(log: test_log).run do |home|
+      wallet = home.create_wallet
+      assert(!wallet.memo.nil?)
+    end
+  end
+
   def test_reads_large_wallet
     key = Zold::Key.new(file: 'fixtures/id_rsa')
     FakeHome.new(log: test_log).run do |home|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.16.8
+  version: 0.16.9
 platform: ruby
 authors:
 - Yegor Bugayenko