zold 0.16.5 → 0.16.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c73944cf9e705895a711529a97a3ab56cd4561724c1b2009416db8355ae9a0e9
-  data.tar.gz: ece33aa66164e63afebc6f2383d4ad18997fa616abf0311b0956d62ec38f10f6
+  metadata.gz: 7190b0b8462533e8c4bd5f97663d78c7b96a2da53d5676c744f6157f99864d1b
+  data.tar.gz: 1aa4b614367a48e79cf6ad83fab9018910f4ba09813ea5f2a8e463241d3fddf1
 SHA512:
-  metadata.gz: 911f89497f640f092f3f7f2acfc192cb7154be4be191f5a75e4101045bd71432cb7235f31595a1c0290de9ce5848cc60e23e803b447f4a2c1e4e02cd449ae012
-  data.tar.gz: f98b5bb83459de3cd8c1576e9736a3f873a5a44255e66a0417307804dccb15702f72a9323b6defb43816e121c1388421d25106376cbff54e8fad563ef6dd06ed
+  metadata.gz: b74b9b9ac60a0abcb280c81eead4ff9b15fa3b139c7973bf80f4f586bbf15feffbf8c085d9b99e8522febb756ab8014702de294e051817a6a41eb274756ac019
+  data.tar.gz: 70f498e4469e72e94d881c7692aa6b7166e76aade1d4b50e60fca1358c859ec65da90af4d57630ef24de009d21eb3540edf5ca1da6694d1a5903480e2e53f1f0

data/lib/zold/tax.rb

@@ -33,11 +33,14 @@ require_relative 'amount'
 module Zold
   # A single tax payment
   class Tax
-    # The exact score a wallet can buy in order to pay taxes.
+    # The exact score a wallet can/must buy in order to pay taxes.
     EXACT_SCORE = 8
 
     # The maximum allowed amount in one transaction.
-    MAX_PAYMENT = Amount.new(zld: 1.0)
+    # 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: 16.0)
 
     # This is how much we charge per one transaction per hour
     # of storage. A wallet of 4096 transactions will pay
@@ -48,9 +51,6 @@ module Zold
     # is bigger than this threshold, nodes must stop accepting PUSH.
     TRIAL = Amount.new(zld: 1.0)
 
-    # For how many days to pay at once.
-    DAYS_INCREMENT = 64
-
     # Text prefix for taxes details
     PREFIX = 'TAXES'
 
@@ -86,7 +86,7 @@ module Zold
         next if score.strength < Score::STRENGTH
         next if t.amount > Tax::MAX_PAYMENT
         t
-      end.reject(&:nil?).uniq(&:details)
+      end.compact.uniq(&:details)
       paid = scored.empty? ? Amount::ZERO : scored.map(&:amount).inject(&:+)
       owned = Tax::FEE_TXN_HOUR * txns.count * @wallet.age
       owned - paid

data/lib/zold/version.rb

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

data/lib/zold/wallet.rb

@@ -70,6 +70,10 @@ module Zold
       id.to_s
     end
 
+    def to_text
+      (@head.fetch + [''] + @txns.fetch.map(&:to_text)).join("\n")
+    end
+
     def network
       n = @head.fetch[0].strip
       raise "Invalid network name '#{n}'" unless n =~ /^[a-z]{4,16}$/

data/test/commands/test_taxes.rb

@@ -41,11 +41,12 @@ class TestTaxes < Minitest::Test
     FakeHome.new(log: test_log).run do |home|
       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,
-          Zold::Amount.new(zld: 19.99),
+          fund,
           'NOPREFIX', Zold::Id.new, '-'
         )
       )
@@ -62,12 +63,12 @@ class TestTaxes < Minitest::Test
       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(Zold::Amount.new(coins: 81_561_428_951), wallet.balance)
+      assert_equal(fund - Zold::Tax::MAX_PAYMENT, wallet.balance)
       wallet.add(
         Zold::Txn.new(
           2,
           Time.now - 24 * 60 * 60 * 365 * 300,
-          Zold::Amount.new(zld: 19.99),
+          fund,
           'NOPREFIX', Zold::Id.new, '-'
         )
       )
@@ -77,7 +78,7 @@ class TestTaxes < Minitest::Test
           '--ignore-nodes-absence', 'pay', wallet.id.to_s
         ]
       )
-      assert_equal(Zold::Amount.new(coins: 167_417_825_198), wallet.balance)
+      assert_equal(fund + fund - Zold::Tax::MAX_PAYMENT, wallet.balance)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.16.5
+  version: 0.16.6
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-31 00:00:00.000000000 Z
+date: 2018-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace