zold 0.21.2 → 0.21.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f59929d65212d37d32f1f98418735329e8194520b349f74c44dca7409ed610e4
-  data.tar.gz: 3d81af110e3e5835272484ee0a0b420e6f58bd87b9b035faba6a48f2d16f697c
+  metadata.gz: b76d686809ed0f518c099bd7afbf901a6e4c8f8d4e23cd8950924a724396a082
+  data.tar.gz: 32f523eacb60a2a2c367fccf7ea1e732b1ed4c58ee763cc5effa654c770a5812
 SHA512:
-  metadata.gz: 3e88d9c8d354a0181c054a21ddbab493bc8161463112b18436777fa814d714b9ada75c70fe6703f06bfec564a3cd26c6b149496cd33490ce9539a1b498f10d42
-  data.tar.gz: 7f85bacbe457dc46ee7ae4a46fba59211e16db5e35c951eef6a48e0500ee827c8deb78b91ee7e71c0f750bf335f62e3e2cf6460fc4afdd0772388063ab9b2c9c
+  metadata.gz: 34659e7ff4e6e4718dc3832da26e93244c1665acd682c85b369e8c1f9239b44917077fa45f45b03971ea69c2dd2ea06ba7bbaf5a65817f0d5ff03ac72ba4bfa0
+  data.tar.gz: aac7c961982d024da032366651a5fd557980d3aa0074628941589b0969e670c78d6ac1a4cb710e56f900c75b351e017d9043083f913af1a9ebae10c4759afff7

data/lib/zold/amount.rb

@@ -58,9 +58,14 @@ module Zold
       @zents
     end
 
+    # Convert to ZLD and return as a float.
+    def to_f
+      @zents.to_f / 2**FRACTION
+    end
+
     # Convert to ZLD and return as a string. If you need float, you should use <tt>to_f()</tt> later.
     def to_zld(digits = 2)
-      format("%0.#{digits}f", @zents.to_f / 2**FRACTION)
+      format("%0.#{digits}f", to_f)
     end
 
     def to_s

data/lib/zold/commands/fetch.rb

@@ -29,7 +29,6 @@ require 'rainbow'
 require 'concurrent/atomics'
 require 'zold/score'
 require 'concurrent'
-require 'parallel'
 require_relative 'thread_badge'
 require_relative 'args'
 require_relative '../thread_pool'

data/lib/zold/commands/push.rb

@@ -25,7 +25,6 @@ require 'slop'
 require 'json'
 require 'net/http'
 require 'concurrent'
-require 'parallel'
 require_relative 'thread_badge'
 require_relative 'args'
 require_relative '../thread_pool'

data/lib/zold/node/front.rb

@@ -251,7 +251,9 @@ this is not a normal behavior, you may want to report a bug to our GitHub reposi
           digest: wallet.digest,
           copies: Copies.new(File.join(settings.copies, wallet.id)).all.count,
           balance: wallet.balance.to_i,
-          txns: wallet.txns.count
+          txns: wallet.txns.count,
+          taxes: Tax.new(wallet).paid.to_i,
+          debt: Tax.new(wallet).debt.to_i
         )
       end
     end

data/lib/zold/node/safe_entrance.rb

@@ -22,7 +22,6 @@
 
 require 'concurrent'
 require 'tempfile'
-require_relative 'emission'
 require_relative 'soft_error'
 require_relative '../log'
 require_relative '../remotes'
@@ -74,7 +73,6 @@ module Zold
         if balance.negative? && !wallet.root?
           raise SoftError, "The balance #{balance} of #{wallet.id} is negative and it's not a root wallet"
         end
-        Emission.new(wallet).check
         tax = Tax.new(wallet)
         if tax.in_debt?
           raise SoftError, "Taxes are not paid, can't accept the wallet #{wallet.mnemo}; the debt is #{tax.debt} \

data/lib/zold/node/spread_entrance.rb

@@ -22,7 +22,6 @@
 
 require 'concurrent'
 require 'tempfile'
-require_relative 'emission'
 require_relative '../log'
 require_relative '../remotes'
 require_relative '../copies'

data/lib/zold/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.21.2
+  version: 0.21.3
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-07 00:00:00.000000000 Z
+date: 2019-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace
@@ -637,7 +637,6 @@ files:
 - lib/zold/log.rb
 - lib/zold/metronome.rb
 - lib/zold/node/async_entrance.rb
-- lib/zold/node/emission.rb
 - lib/zold/node/entrance.rb
 - lib/zold/node/farm.rb
 - lib/zold/node/farmers.rb
@@ -693,7 +692,6 @@ files:
 - test/node/fake_entrance.rb
 - test/node/fake_node.rb
 - test/node/test_async_entrance.rb
-- test/node/test_emission.rb
 - test/node/test_entrance.rb
 - test/node/test_farm.rb
 - test/node/test_farmers.rb
@@ -746,7 +744,7 @@ licenses:
 - MIT
 metadata: {}
 post_install_message: |-
-  Thanks for installing Zold 0.21.2!
+  Thanks for installing Zold 0.21.3!
     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
@@ -802,7 +800,6 @@ test_files:
 - test/node/fake_entrance.rb
 - test/node/fake_node.rb
 - test/node/test_async_entrance.rb
-- test/node/test_emission.rb
 - test/node/test_entrance.rb
 - test/node/test_farm.rb
 - test/node/test_farmers.rb

data/lib/zold/node/emission.rb

@@ -1,61 +0,0 @@
-# frozen_string_literal: true
-
-# Copyright (c) 2018-2019 Zerocracy, Inc.
-#
-# 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 'concurrent'
-require 'tempfile'
-require_relative '../log'
-require_relative '../remotes'
-require_relative '../copies'
-require_relative '../tax'
-require_relative '../commands/merge'
-require_relative '../commands/fetch'
-require_relative '../commands/push'
-
-# The emission control point.
-# Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2018 Yegor Bugayenko
-# License:: MIT
-module Zold
-  # The emission control poine
-  class Emission
-    def initialize(root)
-      @root = root
-    end
-
-    def quota
-      years = @root.age / (24 * 1024)
-      1 - (2**-years)
-    end
-
-    def limit
-      max = Amount::MAX
-      Amount.new(zents: (max * quota).to_i)
-    end
-
-    def check
-      return unless @root.root?
-      allowed = limit * -1
-      balance = @root.balance
-      raise "The balance #{balance} of the root wallet is too low (max allowed: #{allowed})" if balance < allowed
-    end
-  end
-end

data/test/node/test_emission.rb

@@ -1,60 +0,0 @@
-# frozen_string_literal: true
-
-# Copyright (c) 2018-2019 Zerocracy, Inc.
-#
-# 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 '../fake_home'
-require_relative '../test__helper'
-require_relative '../../lib/zold/node/emission'
-require_relative '../../lib/zold/amount'
-
-class EmissionTest < Zold::Test
-  def test_emission
-    (1..10).each do |year|
-      FakeHome.new(log: test_log).run do |home|
-        wallet = home.create_wallet
-        wallet.add(
-          Zold::Txn.new(
-            1, Time.now - 60 * 24 * 365 * year,
-            Zold::Amount.new(zld: 39.99),
-            'NOPREFIX', Zold::Id::ROOT, '-'
-          )
-        )
-        test_log.info("Year: #{year}, Quota: #{(Zold::Emission.new(wallet).quota * 100).round(2)}%, \
-Limit: #{Zold::Emission.new(wallet).limit}")
-      end
-    end
-  end
-
-  def test_emission_passes
-    FakeHome.new(log: test_log).run do |home|
-      wallet = home.create_wallet(Zold::Id::ROOT)
-      wallet.add(
-        Zold::Txn.new(
-          1, Time.now - 60 * 24,
-          Zold::Amount.new(zld: 10.99),
-          'NOPREFIX', Zold::Id.new, '-'
-        )
-      )
-      Zold::Emission.new(wallet).check
-    end
-  end
-end