zold 0.14.45 → 0.14.46

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3dc091e61d283ef577ce87d8820b39688a07c57f628992f566ed3fd73845c536
-  data.tar.gz: b521a547e508f4b3d562ab0c166baf686cfca29879c25366bf46325e91e156c0
+  metadata.gz: c359aed6c4deb0d0a24de1ca8708f6cdb8fac8da481392df5e8a375c5c9edb1a
+  data.tar.gz: b967d7822af606bcd9f19d6601498d8b00693599512f3a008ece9336334e8f40
 SHA512:
-  metadata.gz: c54c68946531a91b6087f7cfaf311dc0b11f7e20fcf0b6e053792c7d525bb608759f18cbbac16811ae35aa6d0ba79add1ba66848c3b070937d24356370d47437
-  data.tar.gz: ce085d811af804213af2efbd8ced6bec1afa62127fdd3d83c5d0d4463b515bcaad0687037109a6a1770ff7c8c8f4e9c4745a01cf57a6ff628d45963e803d7aaf
+  metadata.gz: 6f4c779de8bbcda39f648e7b3e8d062cf9d2462092b109ac23870eb397f23ad15950a1ef32cc461dca17c116a2893595ebd7dd801e798939b4b76b812d0ce433
+  data.tar.gz: 12c2f331075d390b253928200024b82cea9c78367f0a4155a0407ad0c0c077ddef8037004959cb7c1c41bb92d5e6ff5fb39244c8d23fe5e36fbe3338e841d6da

data/lib/zold/commands/taxes.rb

@@ -75,6 +75,9 @@ Available options:"
         o.bool '--ignore-score-weakness',
           'Don\'t complain when their score is too weak',
           default: false
+        o.bool '--ignore-nodes-absence',
+          'Don\'t complain if there are not enough nodes in the network to pay taxes',
+          default: false
         o.bool '--help', 'Print instructions'
       end
       mine = Args.new(opts, @log).take || return
@@ -112,20 +115,28 @@ Available options:"
       raise 'The wallet is absent' unless wallet.exists?
       tax = Tax.new(wallet)
       debt = tax.debt
-      @log.debug("The current debt is #{debt} (#{debt.to_i} zents)")
+      @log.info("The current debt is #{debt} (#{debt.to_i} zents)")
       unless tax.in_debt?
         @log.debug("No need to pay taxes yet, until the debt is less than #{Tax::TRIAL} (#{Tax::TRIAL.to_i} zents)")
         return
       end
       top = top_scores(opts)
       while debt > Tax::TRIAL
-        raise 'No acceptable remote nodes, try later' if top.empty?
+        if top.empty?
+          raise 'No acceptable remote nodes, try later' unless opts['ignore-nodes-absence']
+          @log.info('Not enough strong nodes in the network, try later')
+          break
+        end
         best = top.shift
+        if tax.exists?(tax.details(best))
+          @log.debug("The score has already been taxed: #{best}")
+          next
+        end
         txn = tax.pay(Zold::Key.new(file: opts['private-key']), best)
         debt += txn.amount
         @log.info("#{txn.amount} of taxes paid to #{txn.bnf}, #{debt} left to pay")
       end
-      @log.info('The wallet is in good standing, all taxes paid')
+      @log.info('The wallet is in good standing, all taxes paid') unless tax.in_debt?
     end
 
     def debt(wallet, _)

data/lib/zold/tax.rb

@@ -58,8 +58,8 @@ module Zold
     end
 
     # Check whether this tax payment already exists in the wallet.
-    def exists?(txn)
-      !@wallet.txns.find { |t| t.details.start_with?("#{Tax::PREFIX} ") && t.details == txn.details }.nil?
+    def exists?(details)
+      !@wallet.txns.find { |t| t.details.start_with?("#{Tax::PREFIX} ") && t.details == details }.nil?
     end
 
     def details(best)

data/lib/zold/version.rb

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

data/lib/zold/wallet.rb

@@ -133,7 +133,7 @@ module Zold
       dup = txns.find { |t| t.bnf == txn.bnf && t.id == txn.id }
       raise "Wallet #{id} can't pay itself: #{txn}" if txn.bnf == id
       raise "The transaction with the same ID and BNF already exists in #{id}: #{dup}" unless dup.nil?
-      raise "The tax payment already exists in #{id}: #{txn}" if Tax.new(self).exists?(txn)
+      raise "The tax payment already exists in #{id}: #{txn}" if Tax.new(self).exists?(txn.details)
       File.open(@file, 'a') { |f| f.print "#{txn}\n" }
       @txns.flush
     end

data/test/commands/test_taxes.rb

@@ -63,6 +63,21 @@ class TestTaxes < Minitest::Test
         ['taxes', '--private-key=fixtures/id_rsa', '--ignore-score-weakness', 'pay', wallet.id.to_s]
       )
       assert_equal(Zold::Amount.new(coins: 81_561_428_951), wallet.balance)
+      wallet.add(
+        Zold::Txn.new(
+          2,
+          Time.now - 24 * 60 * 60 * 365 * 300,
+          Zold::Amount.new(zld: 19.99),
+          '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(Zold::Amount.new(coins: 167_417_825_198), wallet.balance)
     end
   end
 end

data/test/test_tax.rb

@@ -119,26 +119,8 @@ 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.pay(Zold::Key.new(file: 'fixtures/id_rsa'), score)
-      assert(
-        tax.exists?(
-          Zold::Txn.new(
-            2,
-            Time.now,
-            Zold::Amount.new(zld: 10.99),
-            'AAPREFIX', target.id, tax.details(score)
-          )
-        )
-      )
-      assert(
-        !tax.exists?(
-          Zold::Txn.new(
-            2,
-            Time.now,
-            Zold::Amount.new(zld: 10.99),
-            'NOPREFIX', target.id, '-'
-          )
-        )
-      )
+      assert(tax.exists?(tax.details(score)))
+      assert(!tax.exists?('-'))
     end
   end
 end

metadata

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