zold 0.31.0 → 0.31.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eaf97f12668652e8dea6097810416c2440e331366963239e3f2a2610bda97cef
-  data.tar.gz: 771ed9e0c1457455b88ea7d9acfbfb5f7bd42682839080ba19a302e89378a682
+  metadata.gz: a6c2e0650ee2719c29b2be5d2a89e2d8df6a5fe5eec198ded0b2a2406bc7c0d0
+  data.tar.gz: f2759aa84462712e1351288c315b9c13021beb5c0c9eb69e5a78f9974e1b7a5e
 SHA512:
-  metadata.gz: e39d881c991fe021ecee054683f598b93cda07cb968c999699ddb61d9ec0d56848ce7e345d914e466065533f541eb60335bfe9d43c115c5d3809d9b5e565911c
-  data.tar.gz: cbe18090d252ee05c8aa16d0445fff773d1479086e187649593bc268f70de328e2dba6f7c4eed40ee974adf68c062dd50e1f08a9cec456d870fa066a00c3866d
+  metadata.gz: 9109e7e7cd1afe84a2dcddcf74ff24a6489049fd99c75d556e8ec58f75fe4556775e5ca860f2ae58a40e6bfa1df71d5850781d385709d40466a045af7329bc82
+  data.tar.gz: bcd96058d3dc22767340e39862cd6e5d0aa5100ab666ef68bac48fbea937b44a2561ca773c7a88dfa88ac3177231a7a7eb29736338184a0ff8e49dfe9dad3355

data/lib/zold/commands/alias.rb

@@ -17,6 +17,7 @@ module Zold
     end
 
     def run(args = [])
+      @log.debug("Alias.run(#{args.join(' ')})")
       opts = Slop.parse(args, help: true, suppress_errors: true) do |o|
         o.banner = "Usage: zold alias [args]
     #{Rainbow('alias set <wallet> <alias>').green}

data/lib/zold/commands/calculate.rb

@@ -39,6 +39,7 @@ module Zold
     end
 
     def run(args = [])
+      @log.debug("Calculate.run(#{args.join(' ')})")
       opts = Slop.parse(args, help: true, suppress_errors: true) do |o|
         o.banner = "Usage: zold score [options]
 Available options:"

data/lib/zold/commands/clean.rb

@@ -50,6 +50,7 @@ module Zold
     end
 
     def run(args = [])
+      @log.debug("Clean.run(#{args.join(' ')})")
       opts = Slop.parse(args, help: true, suppress_errors: true) do |o|
         o.banner = "Usage: zold clean [ID...] [options]
 Available options:"

data/lib/zold/commands/create.rb

@@ -44,6 +44,7 @@ module Zold
     end
 
     def run(args = [])
+      @log.debug("Create.run(#{args.join(' ')})")
       opts = Slop.parse(args, help: true, suppress_errors: true) do |o|
         o.banner = "Usage: zold create [options]
 Available options:"

data/lib/zold/commands/diff.rb

@@ -46,6 +46,7 @@ module Zold
     end
 
     def run(args = [])
+      @log.debug("Diff.run(#{args.join(' ')})")
       opts = Slop.parse(args, help: true, suppress_errors: true) do |o|
         o.banner = "Usage: zold diff [ID...] [options]
 Available options:"

data/lib/zold/commands/fetch.rb

@@ -70,6 +70,7 @@ module Zold
     end
 
     def run(args = [])
+      @log.debug("Fetch.run(#{args.join(' ')})")
       opts = Slop.parse(args, help: true, suppress_errors: true) do |o|
         o.banner = "Usage: zold fetch [ID...] [options]
 Available options:"

data/lib/zold/commands/invoice.rb

@@ -44,6 +44,7 @@ module Zold
     end
 
     def run(args = [])
+      @log.debug("Invoice.run(#{args.join(' ')})")
       opts = Slop.parse(args, help: true, suppress_errors: true) do |o|
         o.banner = "Usage: zold invoice ID [options]
 Where:

data/lib/zold/commands/merge.rb

@@ -51,6 +51,7 @@ module Zold
 
     # Returns the array of modified wallets (IDs)
     def run(args = [])
+      @log.debug("Merge.run(#{args.join(' ')})")
       opts = Slop.parse(args, help: true, suppress_errors: true) do |o|
         o.banner = "Usage: zold merge [ID...] [options]
 Available options:"

data/lib/zold/commands/next.rb

@@ -39,6 +39,7 @@ module Zold
     end
 
     def run(args = [])
+      @log.debug("Next.run(#{args.join(' ')})")
       opts = Slop.parse(args, help: true, suppress_errors: true) do |o|
         o.banner = "Usage: zold next [options] score
 Available options:"

data/lib/zold/commands/node.rb

@@ -73,6 +73,7 @@ module Zold
     end
 
     def run(args = [])
+      @log.debug("Node.run(#{args.join(' ')})")
       opts = Slop.parse(args, help: true, suppress_errors: true) do |o|
         o.banner = 'Usage: zold node [options]'
         o.string '--invoice',

data/lib/zold/commands/pay.rb

@@ -48,6 +48,7 @@ module Zold
     # Sends a payment and returns the transaction just created in the
     # paying wallet, an instance of Zold::Txn
     def run(args = [])
+      @log.debug("Pay.run(#{args.join(' ')})")
       opts = Slop.parse(args, help: true, suppress_errors: true) do |o|
         o.banner = "Usage: zold pay wallet target amount [details] [options]
 Where:
@@ -84,6 +85,9 @@ Available options:"
         o.bool '--dont-pay-taxes',
           'Don\'t pay taxes even if the wallet is in debt',
           default: false
+        o.bool '--pay-taxes-anyway',
+          'Pay taxes even if the wallet is not in debt',
+          default: false
         o.bool '--skip-propagate',
           'Don\'t propagate the paying wallet after successful pay',
           default: false
@@ -128,17 +132,18 @@ Available options:"
         raise "Wallet #{id} doesn't exist, do 'zold pull' first" unless wallet.exists?
         Tax.new(wallet).in_debt? && !opts['dont-pay-taxes']
       end
-      return unless debt
+      return unless debt || opts['pay-taxes-anyway']
       require_relative 'taxes'
       Taxes.new(wallets: @wallets, remotes: @remotes, log: @log).run(
         [
           'taxes',
           'pay',
           "--private-key=#{Shellwords.escape(opts['private-key'])}",
+          opts['pay-taxes-anyway'] ? '--pay-anyway' : '',
           opts['ignore-score-weakness'] ? '--ignore-score-weakness' : '',
           id.to_s,
           "--keygap=#{Shellwords.escape(opts['keygap'])}"
-        ]
+        ].reject(&:empty?)
       )
     end
 

data/lib/zold/commands/propagate.rb

@@ -46,6 +46,7 @@ module Zold
 
     # Returns list of Wallet IDs which were affected
     def run(args = [])
+      @log.debug("Propagate.run(#{args.join(' ')})")
       opts = Slop.parse(args, help: true, suppress_errors: true) do |o|
         o.banner = "Usage: zold propagate [ID...] [options]
 Available options:"

data/lib/zold/commands/push.rb

@@ -59,6 +59,7 @@ module Zold
     end
 
     def run(args = [])
+      @log.debug("Push.run(#{args.join(' ')})")
       opts = Slop.parse(args, help: true, suppress_errors: true) do |o|
         o.banner = "Usage: zold push [ID...] [options]
 Available options:"

data/lib/zold/commands/remote.rb

@@ -54,6 +54,7 @@ module Zold
     end
 
     def run(args = [])
+      @log.debug("Remote.run(#{args.join(' ')})")
       opts = Slop.parse(args, help: true, suppress_errors: true) do |o|
         o.banner = "Usage: zold remote <command> [options]
 Available commands:

data/lib/zold/commands/remove.rb

@@ -41,6 +41,7 @@ module Zold
     end
 
     def run(args = [])
+      @log.debug("Remove.run(#{args.join(' ')})")
       opts = Slop.parse(args, help: true, suppress_errors: true) do |o|
         o.banner = "Usage: zold remove [ID...] [options]
 Available options:"

data/lib/zold/commands/show.rb

@@ -48,6 +48,7 @@ module Zold
     end
 
     def run(args = [])
+      @log.debug("Show.run(#{args.join(' ')})")
       opts = Slop.parse(args, help: true, suppress_errors: true) do |o|
         o.banner = "Usage: zold show [ID...] [options]
 Available options:"

data/lib/zold/commands/taxes.rb

@@ -61,6 +61,7 @@ module Zold
     end
 
     def run(args = [])
+      @log.debug("Taxes.run(#{args.join(' ')})")
       opts = Slop.parse(args, help: true, suppress_errors: true) do |o|
         o.banner = "Usage: zold taxes command [options]
 Available commands:
@@ -75,6 +76,9 @@ Available options:"
           'The location of RSA private key (default: ~/.ssh/id_rsa)',
           require: true,
           default: '~/.ssh/id_rsa'
+        o.bool '--pay-anyway',
+          'Pay taxes anyway, even if the wallet is not in debt',
+          default: false
         o.bool '--ignore-score-weakness',
           'Don\'t complain when their score is too weak',
           default: false
@@ -123,7 +127,7 @@ Available options:"
       debt = total = tax.debt
       @log.info("The current debt of #{wallet.mnemo} is #{debt} (#{debt.to_i} zents), \
 the balance is #{wallet.balance}: #{tax.to_text}")
-      unless tax.in_debt?
+      unless tax.in_debt? || opts['pay-anyway']
         @log.debug("No need to pay taxes yet, while the debt is less than #{Tax::TRIAL} (#{Tax::TRIAL.to_i} zents)")
         return
       end

data/lib/zold/version.rb

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

data/test/commands/test_pay.rb

@@ -172,6 +172,7 @@ class TestPay < Zold::Test
       Zold::Pay.new(wallets: home.wallets, copies: home.dir, remotes: home.remotes, log: accumulating_log).run(
         [
           'pay', '--force', '--private-key=fixtures/id_rsa',
+          '--ignore-score-weakness', '--pay-taxes-anyway',
           source.id.to_s, target.id.to_s, amount.to_zld, 'For the car'
         ]
       )
@@ -179,4 +180,42 @@ class TestPay < Zold::Test
         'No info_messages notified user of tax debt'
     end
   end
+
+  def test_pays_and_taxes
+    FakeHome.new(log: test_log).run do |home|
+      wallet = home.create_wallet
+      fund = Zold::Amount.new(zld: 19.99)
+      10.times do |i|
+        wallet.add(
+          Zold::Txn.new(
+            i + 1,
+            Time.now - 24 * 60 * 60 * 365 * 300,
+            fund,
+            'NOPREFIX', Zold::Id.new, '-'
+          )
+        )
+      end
+      score = Zold::Score.new(host: 'localhost', port: 80, strength: 1, invoice: 'NOPREFIX@0000000000000000')
+      10.times { score = score.next }
+      remotes = home.remotes
+      remotes.add(score.host, score.port)
+      stub_request(:get, "http://#{score.host}:#{score.port}/").to_return(
+        status: 200,
+        body: {
+          score: score.to_h
+        }.to_json
+      )
+      before = wallet.balance
+      target = home.create_wallet
+      Zold::Pay.new(wallets: home.wallets, copies: home.dir, remotes: remotes, log: test_log).run(
+        [
+          'pay', '--force', '--private-key=fixtures/id_rsa',
+          '--ignore-score-weakness',
+          wallet.id.to_s, target.id.to_s, fund.to_zld, 'For the car'
+        ]
+      )
+      wallet.flush
+      assert(before.to_zld(6) != wallet.balance.to_zld(6))
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.31.0
+  version: 0.31.1
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-04 00:00:00.000000000 Z
+date: 2022-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace
@@ -823,7 +823,7 @@ licenses:
 - MIT
 metadata: {}
 post_install_message: |-
-  Thanks for installing Zold 0.31.0!
+  Thanks for installing Zold 0.31.1!
     Study our White Paper: https://papers.zold.io/wp.pdf
     Read our blog posts: https://blog.zold.io
     Try ZLD online wallet at: https://wts.zold.io