zold 0.11.18 → 0.11.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 169a0ce80fa0bdabfba606230c2b12f918688457
-  data.tar.gz: 582eac190a1f5d87daf92195379c6c755d83dded
+  metadata.gz: 816289bc1a553b8d68c87fddbc146e3762b51647
+  data.tar.gz: 7cdfbeaa949af0c811e51bc5e7a2b60ab7e9cca5
 SHA512:
-  metadata.gz: f9313dd0f6b72d3745a3cf4768fd8617c4d098beb5eeb075b9873ac08ba118dfc0154d20daf00dd6d22a8050361e7ada151b1d2d46f645f53efca5d0b5866eee
-  data.tar.gz: cb64a87a705868388b46a8ca0c9636cb9cc4510b6f0750df388bc693bdb0f08c9145b09335f4cfd30932c2a76f6c88913cd514259e5c2373a774abcf373653a1
+  metadata.gz: 00d3ad3ca4ff95d6fe8166580d3fe91105778c55024d50480ce23934af42972a6509656f8a4a741b16cde8cc0dda0ee7358bfbf1b8111452f7aca3d4fda7e351
+  data.tar.gz: 321040ab95feda603ea6b6a2af005b79268a4242b87d843c2ea52072a182e3c1c11eeca7426bc7a508c842567e881a5c534933979c9b369b188c4dd4209b14f8

data/bin/zold-nohup

@@ -55,7 +55,7 @@ end
 
 def exec(cmd)
   Open3.popen2e(cmd) do |stdin, stdout, thr|
-    log("Started: #{cmd}")
+    log("Started: #{cmd}\n")
     stdin.close
     loop do
       line = stdout.gets
@@ -63,7 +63,7 @@ def exec(cmd)
       log(line)
     end
     code = thr.value.exitstatus
-    log("Exit code is #{code}: #{cmd}")
+    log("Exit code is #{code}: #{cmd}\n")
     raise "Exit code #{code} (non zero)" unless code.zero?
   end
 end
@@ -72,10 +72,10 @@ File.delete($opts['log-file']) if File.exist?($opts['log-file']) && !$opts['skip
 
 $pid = fork do
   Signal.trap('HUP') do
-    print('Received HUP, ignoring...')
+    log('Received HUP, ignoring...')
   end
   Signal.trap('TERM') do
-    print('Received TERM, terminating...')
+    log('Received TERM, terminating...')
     exit(-1)
   end
   loop do

data/lib/zold/commands/node.rb

@@ -27,6 +27,7 @@ require_relative '../verbose_thread'
 require_relative '../node/entrance'
 require_relative '../node/front'
 require_relative '../node/farm'
+require_relative 'pull'
 require_relative 'push'
 require_relative 'pay'
 
@@ -52,8 +53,8 @@ module Zold
         o.integer '--bind-port',
           "TCP port to listen on (default: #{Remotes::PORT})",
           default: Remotes::PORT
-        o.string '--host', 'Host name (default: 127.0.0.1)',
-          default: '127.0.0.1'
+        o.string '--host', "Host name (default: #{ip})",
+          default: ip
         o.string '--home', 'Home directory (default: .)',
           default: Dir.pwd
         o.integer '--strength',
@@ -128,7 +129,7 @@ module Zold
         threads: opts[:threads], strength: opts[:strength]
       )
       Front.set(:farm, farm)
-      routines = routines(wallets, remotes, farm, opts)
+      routines = routines(wallets, remotes, copies, farm, opts)
       @log.debug("Starting up the web front at http://#{opts[:host]}:#{opts[:port]}...")
       begin
         Front.run!
@@ -140,7 +141,7 @@ module Zold
 
     private
 
-    def routines(wallets, remotes, farm, opts)
+    def routines(wallets, remotes, copies, farm, opts)
       routines = Routines.new(@log)
       routines.add do
         require_relative 'remote'
@@ -151,7 +152,7 @@ module Zold
         )
       end
       if opts['bonus-wallet']
-        routines.add do
+        routines.add(60) do
           require_relative 'remote'
           winners = Remote.new(remotes: remotes, log: @log, farm: farm).run(
             ['remote', 'elect', opts['bonus-wallet'], '--private-key', opts['private-key']]
@@ -160,6 +161,9 @@ module Zold
             @log.info('No winners elected, won\'t pay any bonuses')
           else
             winners.each do |score|
+              Pull.new(wallets: wallets, remotes: remotes, copies: copies, log: @log).run(
+                ['pull', opts['bonus-wallet']]
+              )
               Pay.new(wallets: wallets, remotes: remotes, log: @log).run(
                 [
                   'pay', opts['bonus-wallet'], score.invoice, opts['bonus-amount'],
@@ -177,6 +181,13 @@ module Zold
       routines
     end
 
+    def ip
+      addr = Socket.ip_address_list.detect do |i|
+        i.ipv4? && !i.ipv4_loopback? && !i.ipv4_multicast? && !i.ipv4_private?
+      end
+      addr.nil? ? '127.0.0.1' : addr.ip_address
+    end
+
     # Fake logging facility for Webrick
     class WebrickLog
       def initialize(log)

data/lib/zold/commands/pay.rb

@@ -21,6 +21,8 @@
 require 'slop'
 require 'rainbow'
 require_relative 'args'
+require_relative '../id'
+require_relative '../amount'
 require_relative '../log'
 
 # PAY command.
@@ -55,6 +57,9 @@ Available options:"
         o.bool '--dont-pay-taxes',
           'Don\'t pay taxes even if the wallet is in debt',
           default: false
+        o.bool '--dont-propagate',
+          'Don\'t propagate the paying wallet after successful pay',
+          default: false
         o.bool '--help', 'Print instructions'
       end
       mine = Args.new(opts, @log).take || return
@@ -72,10 +77,15 @@ Available options:"
       amount = Amount.new(zld: mine[2].to_f)
       details = mine[3] || '-'
       if Tax.new(from).in_debt? && !opts['dont-pay-taxes']
+        require_relative 'taxes'
         Taxes.new(wallets: @wallets, remotes: @remotes, log: @log).run(
           ['taxes', "--private-key=#{opts['private-key']}", id.to_s]
         )
       end
+      unless opts['dont-propagate']
+        require_relative 'propagate'
+        Propagate.new(wallets: @wallets, log: @log).run(['propagate', id.to_s])
+      end
       pay(from, invoice, amount, details, opts)
     end
 

data/lib/zold/commands/remote.rb

@@ -185,10 +185,15 @@ Available options:"
         r.assert_score_ownership(score)
         r.assert_score_strength(score) unless opts['ignore-score-weakness']
         @remotes.rescore(score.host, score.port, score.value)
-        if opts['reboot'] && Semantic::Version.new(VERSION) < Semantic::Version.new(json['version'])
-          @log.info("#{r}: their version #{json['version']} is higher than mine #{VERSION}, reboot! \
+        if Semantic::Version.new(VERSION) < Semantic::Version.new(json['version'])
+          if opts['reboot']
+            @log.info("#{r}: their version #{json['version']} is higher than mine #{VERSION}, reboot! \
 (use --never-reboot to avoid this from happening)")
-          exit(0)
+            exit(0)
+          else
+            @log.info("#{r}: their version #{json['version']} is higher than mine #{VERSION}, \
+it's recommended to reboot, but I don't do it because of --never-reboot")
+          end
         end
         if deep
           json['all'].each do |s|

data/lib/zold/routines.rb

@@ -33,13 +33,13 @@ module Zold
       @threads = []
     end
 
-    def add(seconds = 60)
+    def add(minutes = 1)
       @threads << Thread.start do
         VerboseThread.new(@log).run(true) do
           Thread.current.name = 'routines'
           count = 0
           loop do
-            sleep(seconds)
+            sleep(minutes * 60)
             yield count
             count += 1
           end

data/lib/zold/version.rb

@@ -23,5 +23,5 @@
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 module Zold
-  VERSION = '0.11.18'.freeze
+  VERSION = '0.11.19'.freeze
 end

metadata

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