zold 0.17.2 → 0.17.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c96f2da02ec8f5ab59403d7a0031158209698f74f275a42a8bfd92f2db1f6bd
-  data.tar.gz: c6f63597c3da3dc66ca4e38875dddfab3027b0529b434561883f142dee4fe92c
+  metadata.gz: 7b180bc5d7ff240eafaa73f624652f2842cd576f3c43b87642e77d37716249a1
+  data.tar.gz: '0279c65c274f3725bf91ab3ba0b93ed60aca6b9db2edf7ab2a4f546818104acb'
 SHA512:
-  metadata.gz: 05e38a1a02503288a738da6517f3111a2ca53cebfdb27945b2855c12f87d8bf7201e13516a17bc458668b34bb7283a71700941a28c2f3ae1ed60bfc9a1077c0c
-  data.tar.gz: 4c544d8e6c64aab98bdb12e9a80428144e722316087b0f3d9bd63471fd40853c5c5d66f6aa45ae5e5547f0eaeaf8e65a6e807798d6bdb94b4f1b226a4f0269a1
+  metadata.gz: d840735668e54a0d8c88f7161c273631de34c06a938f7232cecbe61e11fe74ebac60fd0f810fcb832ff3b26b73ceb37e4d45a7d9529d6e7f0dda18bce433ad69
+  data.tar.gz: 9ebec3e75b50640543bf569f0957e1808af5f7bb5d82316bf21b58c7f98cec23961a40ed4297a73a52693c9054923c719a34b68bdf2f6e8cf586cad2256c013f

data/bin/zold

@@ -161,20 +161,7 @@ log.debug("Home directory: #{home}")
 zoldata = File.join(home, '.zoldata')
 
 unless opts['skip-upgrades']
-  Zold::Upgrades.new(Zold::VersionFile.new(File.join(zoldata, 'version')), 'upgrades').run
-  # @todo #384:30min This is a workaround, move this code into Upgrades, somehow.
-  #  We should find a way to run these arbitrary scripts and pass arguments
-  #  to them. Each of them may need its own set of arguments.
-  require_relative '../upgrades/2'
-  Zold::UpgradeTo2.new(Dir.pwd, log).exec
-  require_relative '../upgrades/protocol_up'
-  Zold::ProtocolUp.new(Dir.pwd, log).exec
-  require_relative '../upgrades/rename_foreign_wallets'
-  Zold::RenameForeignWallets.new(Dir.pwd, opts['network'], log).exec
-  if command == 'node'
-    require_relative '../upgrades/move_wallets_into_tree'
-    Zold::MoveWalletsIntoTree.new(Dir.pwd, log).exec
-  end
+  Zold::Upgrades.new(Zold::VersionFile.new(File.join(zoldata, 'version')), 'upgrades', { command: command, network: opts['network']}).run
 end
 
 wallets = Zold::SyncWallets.new(

data/lib/zold/commands/node.rb

@@ -123,6 +123,9 @@ module Zold
         o.bool '--no-cache',
           'Skip caching of front JSON pages (will seriously slow down, mostly useful for testing)',
           default: false
+        o.bool '--skip-oom',
+          'Skip Out Of Memory check and never exit, no matter how much RAM is consumed',
+          default: false
         o.integer '--queue-limit',
           'The maximum number of wallets to be accepted via PUSH and stored in the queue (default: 4096)',
           default: 4096

data/lib/zold/copies.rb

@@ -129,7 +129,7 @@ module Zold
     end
 
     def all
-      Futex.new(file, log: @log).open do
+      Futex.new(file, log: @log).open(false) do
         load.group_by { |s| s[:name] }.map do |name, scores|
           {
             name: name,

data/lib/zold/node/farm.rb

@@ -213,7 +213,7 @@ at #{host}:#{port}, strength is #{strength}")
 
     def load
       return [] unless File.exist?(@cache)
-      Futex.new(@cache).open do |f|
+      Futex.new(@cache).open(false) do |f|
         IO.read(f).split(/\n/).map do |t|
           Score.parse(t)
         rescue StandardError => e

data/lib/zold/node/front.rb

@@ -198,7 +198,12 @@ in #{Age.new(@start, limit: 1)}")
         end,
         memory: settings.zache.get(:memory, lifetime: 5 * 60) do
           require 'get_process_mem'
-          GetProcessMem.new.bytes.to_i
+          mem = GetProcessMem.new.bytes.to_i
+          if mem > 256 * 1024 * 1024 && !settings.opts['skip-oom']
+            settings.log.error('We are too big in memory, quitting; use --skip-oom to never quit')
+            Front.stop!
+          end
+          mem
         end,
         platform: RUBY_PLATFORM,
         load: settings.zache.get(:load, lifetime: 5 * 60) do
@@ -453,7 +458,10 @@ in #{Age.new(@start, limit: 1)}")
     end
 
     def processes
-      POSIX::Spawn::Child.new('ps', 'ax').out.split("\n").select { |t| t.include?('zold') }
+      []
+      # This is temporarily disabled. We suspect that this line causes
+      # memory leakage.
+      # POSIX::Spawn::Child.new('ps', 'ax').out.split("\n").select { |t| t.include?('zold') }
     end
 
     def pretty(json)

data/lib/zold/remotes.rb

@@ -245,7 +245,7 @@ module Zold
 
     def modify
       FileUtils.mkdir_p(File.dirname(@file))
-      Futex.new(@file).open(true) do
+      Futex.new(@file).open do
         list = yield(load)
         IO.write(
           @file,

data/lib/zold/tax.rb

@@ -57,10 +57,11 @@ module Zold
     PREFIX = 'TAXES'
     private_constant :PREFIX
 
-    def initialize(wallet, ignore_score_weakness: false)
+    def initialize(wallet, ignore_score_weakness: false, strength: Score::STRENGTH)
       raise "The wallet must be of type Wallet: #{wallet.class.name}" unless wallet.is_a?(Wallet)
       @wallet = wallet
       @ignore_score_weakness = ignore_score_weakness
+      @strength = strength
     end
 
     # Check whether this tax payment already exists in the wallet.
@@ -95,7 +96,7 @@ module Zold
         next if pfx != PREFIX || body.nil?
         score = Score.parse_text(body)
         next if !score.valid? || score.value != EXACT_SCORE
-        next if score.strength < Score::STRENGTH && !@ignore_score_weakness
+        next if score.strength < @strength && !@ignore_score_weakness
         next if t.amount > MAX_PAYMENT
         t
       end.compact.uniq(&:details)

data/lib/zold/upgrades.rb

@@ -25,16 +25,29 @@ require_relative 'log'
 module Zold
   # Class to manage data upgrades (when zold itself upgrades).
   class Upgrades
-    def initialize(version, directory, log: Log::VERBOSE)
+    def initialize(version, directory, opts, log: Log::VERBOSE)
+      raise 'network can\'t be nil' if opts[:network].nil?
       @version = version
       @directory = directory
       @log = log
+      @opts = opts
     end
 
     def run
       Dir.glob("#{@directory}/*.rb").select { |f| f =~ /^(\d+)\.rb$/ }.sort.each do |script|
         @version.apply(script)
       end
+
+      command = @opts[:command]
+      require_relative '../../upgrades/2'
+      Zold::UpgradeTo2.new(Dir.pwd, @log).exec
+      require_relative '../../upgrades/protocol_up'
+      Zold::ProtocolUp.new(Dir.pwd, @log).exec
+      require_relative '../../upgrades/rename_foreign_wallets'
+      Zold::RenameForeignWallets.new(Dir.pwd, @opts[:network], @log).exec
+      return unless command == 'node'
+      require_relative '../../upgrades/move_wallets_into_tree'
+      Zold::MoveWalletsIntoTree.new(Dir.pwd, @log).exec
     end
   end
 end

data/lib/zold/version.rb

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

data/test/test_tax.rb

@@ -105,7 +105,7 @@ class TestTax < Zold::Test
 386d4a ec9eae 306e3d 119d073 1c00dba 1376703 203589 5b55f7"
         )
       )
-      tax = Zold::Tax.new(wallet)
+      tax = Zold::Tax.new(wallet, strength: 6)
       assert_equal(amount, tax.paid)
       assert(tax.debt < Zold::Amount::ZERO, tax.debt)
     end

data/test/test_upgrades.rb

@@ -75,7 +75,7 @@ class TestUpgrades < Zold::Test
   private
 
   def run_upgrades(dir)
-    Zold::Upgrades.new(version_file(dir), dir).run
+    Zold::Upgrades.new(version_file(dir), dir, network: 'test').run
   end
 
   def version_file(dir)

data/zold.gemspec

@@ -86,7 +86,7 @@ and suggests a different architecture for digital wallet maintenance.'
   s.add_runtime_dependency 'usagewatch_ext', '0.2.1'
   s.add_runtime_dependency 'xcop', '0.6'
   s.add_runtime_dependency 'zache', '0.3.1'
-  s.add_runtime_dependency 'zold-score', '0.3.3'
+  s.add_runtime_dependency 'zold-score', '0.3.4'
   s.add_development_dependency 'codecov', '0.1.13'
   s.add_development_dependency 'minitest', '5.11.3'
   s.add_development_dependency 'minitest-fail-fast', '0.1.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.17.2
+  version: 0.17.3
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -366,14 +366,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.4
 - !ruby/object:Gem::Dependency
   name: codecov
   requirement: !ruby/object:Gem::Requirement
@@ -711,7 +711,7 @@ licenses:
 - MIT
 metadata: {}
 post_install_message: |-
-  Thanks for installing Zold 0.17.2!
+  Thanks for installing Zold 0.17.3!
     Study our White Paper: https://papers.zold.io/wp.pdf
     Read our blog posts: https://blog.zold.io
     Try online wallet at: https://wts.zold.io