zold 0.11.16 → 0.11.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 741133a152a47f10deca486c7f68ab98927cb721
-  data.tar.gz: eecf1c370e17a0dea43cf298477234f88d6d5813
+  metadata.gz: c756ab9df322c31f1b31c030d2f6f56971d2ef36
+  data.tar.gz: c03dc1d19510c459ed571a40e60d1e47d3ececd9
 SHA512:
-  metadata.gz: 8b91d87cf98800345481d0296514a29650df203d345acf732f87246589d92c654612d87f727864b208ba566ed93427c439305c721c1a9801c494a43797fe2c30
-  data.tar.gz: 4b15be2214801ddf880f0686494dbe8a93c867ce60d597764aac6c3e1ba8e5232b7e289f357bf1aaf3d82575555cca9aabbb1c3b2f73da490f9116ac077ec9ee
+  metadata.gz: a2f402cb7258a1f85966d2f9a46e15b4a12d44eccc1150259208221a98141553511b23fbec78d93a780af64a59fe94f3c58a36ab8862e442bd1b76313406eac7
+  data.tar.gz: 682b3ad6c5bdec21e0eb95d94c7bac6dd04ad0776027cb96716bfef916bdbb4f4ec935e84f9832b26bc05fe684cb9b7968cd0c7ddfcd3203aabd1909a3061747

data/.rultor.yml

@@ -2,6 +2,7 @@ assets:
   rubygems.yml: zerocracy/home#assets/rubygems.yml
   id_rsa: zerocracy/home#assets/heroku-key
   id_rsa.pub: zerocracy/home#assets/heroku-key.pub
+  bonus.key: zerocracy/home#assets/zold/bonus.key
 install: |
   sudo apt-get -y update
   sudo gem install pdd
@@ -28,7 +29,8 @@ release:
     git add Gemfile.lock
     git add .gitignore
     git fetch
-    git commit -m 'ignores' && git push -f heroku $(git symbolic-ref --short HEAD):master
+    cp ../bonus.key . && git add bonus.key
+    git commit -m 'config' && git push -f heroku $(git symbolic-ref --short HEAD):master
     curl -f --connect-timeout 15 --retry 5 --retry-delay 30 http://b1.zold.io > /dev/null
 architect:
 - yegor256

data/bin/zold-nohup

@@ -38,6 +38,7 @@ end
 
 def exec(cmd)
   Open3.popen2e(cmd) do |stdin, stdout, thr|
+    log("Started: #{cmd}")
     stdin.close
     loop do
       line = stdout.gets
@@ -45,6 +46,7 @@ def exec(cmd)
       log(line)
     end
     code = thr.value.exitstatus
+    log("Exit code is #{code}: #{cmd}")
     raise "Exit code #{code} (non zero)" unless code.zero?
   end
 end

data/heroku.yml

@@ -0,0 +1,9 @@
+build:
+  languages:
+    - ruby
+run:
+  web: |
+    LC_ALL=UTF-8 ./bin/zold node --no-colors --verbose --trace \
+      --bind-port=$PORT --port=80 --host=b1.zold.io --threads=0 \
+      --invoice=JKFq17yipfjLtX@0000000000000000 --never-reboot \
+      --bonus-wallet=81c9c25789b03876 --private-key=bonus.key --bonus-amount=1

data/lib/zold/commands/node.rb

@@ -20,12 +20,15 @@
 
 require 'slop'
 require_relative '../score'
+require_relative '../routines'
 require_relative '../wallets'
 require_relative '../remotes'
 require_relative '../verbose_thread'
 require_relative '../node/entrance'
 require_relative '../node/front'
 require_relative '../node/farm'
+require_relative 'push'
+require_relative 'pay'
 
 # NODE command.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -68,6 +71,14 @@ module Zold
         o.bool '--never-reboot',
           'Don\'t reboot when a new version shows up in the network',
           default: false
+        o.string '--bonus-wallet',
+          'The ID of the wallet to regularly send bonuses from (for nodes online)'
+        o.string '--bonus-amount',
+          'The amount of ZLD to pay to each remote as a bonus',
+          default: '1'
+        o.string '--private-key',
+          'The location of RSA private key (default: ~/.ssh/id_rsa)',
+          default: '~/.ssh/id_rsa'
         o.bool '--help', 'Print instructions'
       end
       if opts.help?
@@ -117,25 +128,51 @@ module Zold
         threads: opts[:threads], strength: opts[:strength]
       )
       Front.set(:farm, farm)
-      update = Thread.start do
-        VerboseThread.new(@log).run(true) do
-          loop do
-            sleep(60)
-            require_relative 'remote'
-            Remote.new(remotes: remotes, log: @log, farm: farm).run(%w[remote add b1.zold.io 80 --force])
-            Remote.new(remotes: remotes, log: @log, farm: farm).run(%w[remote trim])
-            Remote.new(remotes: remotes, log: @log, farm: farm).run(%w[remote update --reboot])
-            @log.info("Regular update of remote nodes succeeded, total=#{remotes.all.count}")
-          end
-        end
-      end
+      routines = routines(wallets, remotes, farm, opts)
       @log.debug("Starting up the web front at http://#{opts[:host]}:#{opts[:port]}...")
       begin
         Front.run!
       ensure
         farm.stop
-        update.exit
+        routines.stop
+      end
+    end
+
+    private
+
+    def routines(wallets, remotes, farm, opts)
+      routines = Routines.new(@log)
+      routines.add do
+        require_relative 'remote'
+        Remote.new(remotes: remotes, log: @log, farm: farm).run(%w[remote add b1.zold.io 80 --force])
+        Remote.new(remotes: remotes, log: @log, farm: farm).run(%w[remote trim])
+        Remote.new(remotes: remotes, log: @log, farm: farm).run(%w[remote update --reboot])
+      end
+      if opts['bonus-wallet']
+        routines.add do
+          require_relative 'remote'
+          winners = Remote.new(remotes: remotes, log: @log, farm: farm).run(
+            ['remote', 'elect', opts['bonus-wallet'], '--private-key', opts['private-key']]
+          )
+          if winners.empty?
+            @log.info('No winners elected, won\'t pay any bonuses')
+          else
+            winners.each do |score|
+              Pay.new(wallets: wallets, remotes: remotes, log: @log).run(
+                [
+                  'pay', opts['bonus-wallet'], score.invoice, opts['bonus-amount'],
+                  "Hosting bonus for #{score.host}:#{score.port} #{score.value}",
+                  '--private-key', opts['private-key']
+                ]
+              )
+              Push.new(wallets: wallets, remotes: remotes, log: @log).run(
+                ['push', opts['bonus-wallet']]
+              )
+            end
+          end
+        end
       end
+      routines
     end
 
     # Fake logging facility for Webrick

data/lib/zold/commands/remote.rb

@@ -58,6 +58,8 @@ Available commands:
       Add a new remote node
     #{Rainbow('remote remove').green} host [port]
       Remove the remote node
+    #{Rainbow('remote elect').green}
+      Pick a random remote node as a target for a bonus awarding
     #{Rainbow('remote trim').green}
       Remote the least reliable nodes
     #{Rainbow('remote update').green}
@@ -66,6 +68,9 @@ Available options:"
         o.bool '--ignore-score-weakness',
           'Don\'t complain when their score is too weak',
           default: false
+        o.bool '--ignore-score-value',
+          'Don\'t complain when their score is too small',
+          default: false
         o.bool '--force',
           'Add/remove if if this operation is not possible',
           default: false
@@ -88,6 +93,8 @@ Available options:"
         add(mine[1], mine[2] ? mine[2].to_i : Remotes::PORT, opts)
       when 'remove'
         remove(mine[1], mine[2] ? mine[2].to_i : Remotes::PORT, opts)
+      when 'elect'
+        elect(opts)
       when 'trim'
         trim(opts)
       when 'update'
@@ -139,6 +146,26 @@ Available options:"
       @log.info("There are #{@remotes.all.count} remote nodes in the list")
     end
 
+    # Returns an array of Zold::Score
+    def elect(opts)
+      scores = []
+      @remotes.all.sample(1).each do |winner|
+        @remotes.iterate(@log, farm: @farm) do |r|
+          next if r.host != winner[:host] || r.port != winner[:port]
+          res = r.http('/').get
+          r.assert_code(200, res)
+          score = Score.parse_json(JSON.parse(res.body)['score'])
+          r.assert_valid_score(score)
+          r.assert_score_ownership(score)
+          r.assert_score_strength(score) unless opts['ignore-score-weakness']
+          r.assert_score_value(score, Tax::EXACT_SCORE) unless opts['ignore-score-value']
+          @log.info("Elected: #{score}")
+          scores << score
+        end
+      end
+      scores
+    end
+
     def trim(opts)
       @remotes.all.each do |r|
         remove(r[:host], r[:port], opts) if r[:errors] > Remotes::TOLERANCE

data/lib/zold/commands/taxes.rb

@@ -124,7 +124,7 @@ Available options:"
         score = Score.parse_json(json['score'])
         r.assert_valid_score(score)
         r.assert_score_strength(score)
-        raise "Score is too small (<#{Tax::EXACT_SCORE})" if score.value < Tax::EXACT_SCORE
+        r.assert_score_value(score, Tax::EXACT_SCORE)
         @log.info("#{r}: #{Rainbow(score.value).green}")
         best << score
       end

data/lib/zold/remotes.rb

@@ -87,7 +87,11 @@ module Zold
       end
 
       def assert_score_strength(score)
-        raise "Score is too weak #{score.strength}" if score.strength < Score::STRENGTH
+        raise "Score is too weak #{score.strength}: #{score}" if score.strength < Score::STRENGTH
+      end
+
+      def assert_score_value(score, min)
+        raise "Score is too small (<#{min}): #{score}" if score.value < min
       end
     end
 

data/lib/zold/routines.rb

@@ -0,0 +1,58 @@
+# Copyright (c) 2018 Yegor Bugayenko
+#
+# 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_relative 'log'
+require_relative 'verbose_thread'
+
+# Background routines.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2018 Yegor Bugayenko
+# License:: MIT
+module Zold
+  # NODE command
+  class Routines
+    def initialize(log = Log::Quiet.new)
+      @log = log
+      @threads = []
+    end
+
+    def add(seconds = 60)
+      @threads << Thread.start do
+        VerboseThread.new(@log).run(true) do
+          Thread.current.name = 'routines'
+          count = 0
+          loop do
+            sleep(seconds)
+            yield count
+            count += 1
+          end
+        end
+      end
+    end
+
+    def stop
+      @threads.each do |t|
+        t.exit
+        @log.debug("#{t.name} thread stopped")
+      end
+      @log.info("#{@threads.count} routine threads stopped")
+    end
+  end
+end

data/lib/zold/version.rb

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

data/resources/remotes

@@ -1,2 +1 @@
 b1.zold.io,80,0,0
-b2.zold.io,4096,0,0

data/test/commands/test_remote.rb

@@ -69,4 +69,23 @@ class TestRemote < Minitest::Test
       assert_equal(4, remotes.all.count)
     end
   end
+
+  def test_elects_a_remote
+    Dir.mktmpdir 'test' do |dir|
+      zero = Zold::Score::ZERO
+      remotes = Zold::Remotes.new(File.join(dir, 'remotes.txt'))
+      remotes.clean
+      remotes.add(zero.host, zero.port)
+      stub_request(:get, "http://#{zero.host}:#{zero.port}/").to_return(
+        status: 200,
+        body: {
+          version: Zold::VERSION,
+          score: zero.to_h
+        }.to_json
+      )
+      cmd = Zold::Remote.new(remotes: remotes, log: test_log)
+      winners = cmd.run(%w[remote elect --ignore-score-value])
+      assert_equal(1, winners.count)
+    end
+  end
 end

data/test/test_routines.rb

@@ -0,0 +1,41 @@
+# Copyright (c) 2018 Yegor Bugayenko
+#
+# 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 'test__helper'
+require_relative '../lib/zold/routines'
+
+# Routines test.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2018 Yegor Bugayenko
+# License:: MIT
+class TestRoutines < Minitest::Test
+  def test_start_and_stop
+    routines = Zold::Routines.new
+    list = []
+    routines.add(0) do |i|
+      list << i
+      sleep(6000)
+    end
+    sleep 0.1 while list.empty?
+    routines.stop
+    assert_equal(1, list.count)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.11.16
+  version: 0.11.17
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -296,7 +296,6 @@ files:
 - Gemfile
 - INSTALL.md
 - LICENSE.txt
-- Procfile
 - README.md
 - Rakefile
 - appveyor.yml
@@ -318,6 +317,7 @@ files:
 - fixtures/scripts/calculate-scores.sh
 - fixtures/scripts/print-helps.sh
 - fixtures/scripts/push-and-pull.sh
+- heroku.yml
 - lib/zold.rb
 - lib/zold/amount.rb
 - lib/zold/atomic_file.rb
@@ -351,6 +351,7 @@ files:
 - lib/zold/patch.rb
 - lib/zold/prefixes.rb
 - lib/zold/remotes.rb
+- lib/zold/routines.rb
 - lib/zold/score.rb
 - lib/zold/signature.rb
 - lib/zold/tax.rb
@@ -392,6 +393,7 @@ files:
 - test/test_patch.rb
 - test/test_prefixes.rb
 - test/test_remotes.rb
+- test/test_routines.rb
 - test/test_score.rb
 - test/test_signature.rb
 - test/test_tax.rb
@@ -463,6 +465,7 @@ test_files:
 - test/test_patch.rb
 - test/test_prefixes.rb
 - test/test_remotes.rb
+- test/test_routines.rb
 - test/test_score.rb
 - test/test_signature.rb
 - test/test_tax.rb

data/Procfile

@@ -1 +0,0 @@
-web: LC_ALL=UTF-8 ./bin/zold node --no-colors --verbose --trace --bind-port=$PORT --port=80 --host=b1.zold.io --threads=0 --invoice=JKFq17yipfjLtX@0000000000000000 --never-reboot