zold 0.13.10 → 0.13.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38c2642514a0b37287ede3586753488614dcfe42
-  data.tar.gz: f05390379244ccc99dc1954518ba049645f8d125
+  metadata.gz: 9c81c7772e47855ebd6af3e85ea2f182c509ba60
+  data.tar.gz: 9ca2681e2924bec9f15b151c983607a1b6371c09
 SHA512:
-  metadata.gz: ed304d194952468d46e5a2c903c76219d179c988d1bb47c99705c6faf249c1781d326eb561e14a80118309cde2878f7e5f2631fd6b4e23fedf63db4749585a71
-  data.tar.gz: 57a78853dd1b5e7302022fbc3574e69dcd48b97abdd0938bce00f8b93cd872df0f6c731f6b3a2b32689f13ae63ad7972ffd1e9e683daac6988b88d693e649790
+  metadata.gz: be840135594a5a105bf2a14a7ea46651f69ab500217e78414c90f4db5b9b2d96078227cf4f7d0d0e636f6ed7bffbd40a3cd1807bc02e4c065ef68348214e1ef0
+  data.tar.gz: 253ef4deebb11727c2bacc5ec92e22efb2ff92fc44b42a5c3a37a8e85e39ec4aac9616a4570f5323225be9f96100e018c2d901d318fcd3dbb6fb1d810af87e7c

data/.rultor.yml

@@ -9,10 +9,10 @@ install: |
 release:
   script: |-
     [[ "${tag}" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]] || exit -1
-    bundle install
-    rake
     rm -rf *.gem
     sed -i "s/0\.0\.0/${tag}/g" lib/zold/version.rb
+    bundle install
+    rake
     git add lib/zold/version.rb
     git commit -m "version set to ${tag}"
     gem build zold.gemspec

data/INSTALL.md

@@ -10,6 +10,10 @@ install [Ruby 2.3+](https://www.ruby-lang.org/en/documentation/installation/),
 [Rubygems](https://rubygems.org/pages/download), and
 then the [gem](https://rubygems.org/gems/zold).
 
+We recommend to host nodes at
+[AWS](https://aws.amazon.com/) or
+[DigitalOcean](https://www.digitalocean.com/).
+
 ## Debian 9.4
 
 ```bash
@@ -28,9 +32,9 @@ $ gem install --no-ri --no-rdoc zold
 
 ## OSX
 
-With homebrew:
+With [Homebrew](https://brew.sh/) (recommended):
 
-```
+```bash
 $ brew install rbenv ruby-build
 $ rbenv install 2.5.1
 $ rbenv global 2.5.1
@@ -40,23 +44,32 @@ $ gem install --no-ri --no-rdoc zold
 
 Without homebrew:
 
-... no idea ...
+... please contribute ...
 
 ## Windows
 
 ... please contribute ...
 
-## CentOS
+## CentOS 7.5
 
-... please contribute ...
+As a `root` user:
+
+```bash
+$ sudo yum install zlib-devel gcc gcc-c++ ruby-devel rubygems ruby
+$ gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
+$ curl -sSL https://get.rvm.io | bash -s stable
+$ source /etc/profile.d/rvm.sh
+$ rvm install 2.5.1
+$ gem install --no-ri --no-rdoc zold
+```
 
 ## Amazon Linux (AWS EC2 default image)
 
 ```
-sudo yum install zlib-devel gcc gcc-c++ ruby-devel rubygems ruby
-gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
-curl -sSL https://get.rvm.io | bash -s stable
-source $HOME/.rvm/scripts/rvm
-rvm install 2.5.1
-gem install zold
+$ sudo yum install zlib-devel gcc gcc-c++ ruby-devel rubygems ruby
+$ gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
+$ curl -sSL https://get.rvm.io | bash -s stable
+$ source $HOME/.rvm/scripts/rvm
+$ rvm install 2.5.1
+$ gem install --no-ri --no-rdoc zold
 ```

data/lib/zold/commands/pay.rb

@@ -57,7 +57,7 @@ Available options:"
         o.bool '--dont-pay-taxes',
           'Don\'t pay taxes even if the wallet is in debt',
           default: false
-        o.bool '--dont-propagate',
+        o.bool '--skip-propagate',
           'Don\'t propagate the paying wallet after successful pay',
           default: false
         o.bool '--help', 'Print instructions'
@@ -82,11 +82,10 @@ Available options:"
           ['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)
+      return if opts['skip-propagate']
+      require_relative 'propagate'
+      Propagate.new(wallets: @wallets, log: @log).run(['propagate', from.id.to_s])
     end
 
     private

data/lib/zold/commands/remote.rb

@@ -218,11 +218,6 @@ it's recommended to reboot, but I don't do it because of --never-reboot")
 
     def terminate
       @log.info("All threads before exit: #{Thread.list.map { |t| "#{t.name}/#{t.status}" }.join(', ')}")
-      Kernel.at_exit do
-        @log.info("About to terminate #{Thread.list.count} threads...")
-        Thread.each(&:exit)
-        @log.info("#{Thread.list.count} threads terminated")
-      end
       Kernel.exit(0)
     end
   end

data/lib/zold/commands/routines/bonuses.rb

@@ -47,17 +47,18 @@ module Zold
         raise '--bonus-wallet is required to pay bonuses' unless @opts['bonus-wallet']
         raise '--bonus-amount is required to pay bonuses' unless @opts['bonus-amount']
         winners = Remote.new(remotes: @remotes, log: @log, farm: @farm).run(
-          ['remote', 'elect', @opts['bonus-wallet'], '--private-key', @opts['private-key']]
+          ['remote', 'elect', @opts['bonus-wallet'], '--private-key', @opts['private-key']] +
+          (@opts['ignore-score-weakness'] ? ['--ignore-score-weakness'] : [])
         )
         return if winners.empty?
         winners.each do |score|
           Pull.new(wallets: @wallets, remotes: @remotes, copies: @copies, log: @log).run(
-            ['pull', opts['bonus-wallet']]
+            ['pull', @opts['bonus-wallet']]
           )
           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}",
+              'pay', @opts['bonus-wallet'], score.invoice, @opts['bonus-amount'].to_s,
+              "Hosting bonus for #{score.host} #{score.port} #{score.value}",
               '--private-key', @opts['private-key']
             ]
           )

data/lib/zold/node/front.rb

@@ -129,7 +129,7 @@ module Zold
         remotes: settings.remotes.all.count,
         farm: settings.farm.to_json,
         entrance: settings.entrance.to_json,
-        date: `date  --iso-8601=seconds -u`.strip,
+        date: Time.now.utc.iso8601,
         hours_alive: ((Time.now - settings.start) / (60 * 60)).round(2),
         home: 'https://www.zold.io'
       )

data/lib/zold/score.rb

@@ -138,6 +138,8 @@ module Zold
         suffixes: @suffixes,
         strength: @strength,
         hash: value.zero? ? nil : hash,
+        expired: expired?,
+        valid: valid?,
         minutes: ((Time.now - @time) / 60).to_i
       }
     end
@@ -159,6 +161,7 @@ module Zold
           strength: @strength
         )
         return score if score.valid?
+        return Score.new(Time.now, @host, @port, @invoice, [], strength: @strength) if score.expired?
         idx += 1
       end
     end

data/lib/zold/version.rb

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

data/test/commands/routines/test_bonuses.rb

@@ -19,9 +19,13 @@
 # SOFTWARE.
 
 require 'minitest/autorun'
+require 'webmock/minitest'
 require_relative '../../test__helper'
 require_relative '../../fake_home'
+require_relative '../../node/fake_node'
 require_relative '../../../lib/zold/node/farm.rb'
+require_relative '../../../lib/zold/commands/push'
+require_relative '../../../lib/zold/commands/pay'
 require_relative '../../../lib/zold/commands/routines/bonuses.rb'
 
 # Bonuses test.
@@ -30,19 +34,38 @@ require_relative '../../../lib/zold/commands/routines/bonuses.rb'
 # License:: MIT
 class TestBonuses < Minitest::Test
   def test_pays_bonuses
-    FakeHome.new.run do |home|
-      wallet = home.create_wallet
-      opts = {
-        'routine-immediately' => true,
-        'private-key' => 'fixtures/id_rsa',
-        'bonus-wallet' => wallet.id.to_s,
-        'bonus-amount' => 1
-      }
-      routine = Zold::Routines::Bonuses.new(
-        opts, home.wallets, home.remotes, home.copies(wallet).root,
-        Zold::Farm::Empty.new, log: test_log
-      )
-      routine.exec
+    FakeNode.new(log: test_log).run(['--ignore-score-weakness']) do |port|
+      FakeHome.new.run do |home|
+        bank = home.create_wallet
+        Zold::Pay.new(wallets: home.wallets, remotes: home.remotes, log: test_log).run(
+          ['pay', home.create_wallet.id.to_s, bank.id.to_s, '100', '--force', '--private-key=id_rsa']
+        )
+        assert_equal(Zold::Amount.new(zld: 100.0), bank.balance)
+        opts = {
+          'ignore-score-weakness' => true,
+          'routine-immediately' => true,
+          'private-key' => 'id_rsa',
+          'bonus-wallet' => bank.id.to_s,
+          'bonus-amount' => 1
+        }
+        score = Zold::Score.new(Time.now, 'fake-node.local', 999, 'NOPREFIX@ffffffffffffffff', strength: 1)
+        16.times { score = score.next }
+        remotes = home.remotes
+        remotes.add('localhost', port)
+        remotes.add(score.host, score.port)
+        stub_request(:get, "http://#{score.host}:#{score.port}/").to_return(
+          status: 200,
+          body: {
+            version: Zold::VERSION,
+            score: score.to_h
+          }.to_json
+        )
+        Zold::Routines::Bonuses.new(
+          opts, home.wallets, remotes, home.copies(bank).root,
+          Zold::Farm::Empty.new, log: test_log
+        ).exec
+        assert_equal(Zold::Amount.new(zld: 99.0), bank.balance)
+      end
     end
   end
 end

data/test/test_score.rb

@@ -38,6 +38,17 @@ class TestScore < Minitest::Test
     assert_equal(64, score.hash.length)
   end
 
+  def test_drops_to_zero_when_expired
+    score = Zold::Score.new(
+      Time.now - 24 * 60 * 60,
+      'some-host', 9999, 'NOPREFIX@ffffffffffffffff',
+      strength: 50
+    ).next
+    assert(score.valid?)
+    assert(!score.expired?)
+    assert_equal(0, score.value)
+  end
+
   def test_validates_wrong_score
     score = Zold::Score.new(
       Time.parse('2017-07-19T21:24:51Z'),
@@ -108,14 +119,6 @@ class TestScore < Minitest::Test
     assert(!score.expired?)
   end
 
-  def test_expires_correctly
-    score = Zold::Score.new(
-      Time.now - 100 * 60 * 60, 'localhost', 443,
-      'NOPREFIX@ffffffffffffffff', strength: 2
-    ).next.next.next
-    assert(score.expired?)
-  end
-
   def test_dont_expire_correctly
     score = Zold::Score.new(
       Time.now - 10 * 60 * 60, 'localhost', 443,

data/test/test_zold.rb

@@ -22,6 +22,7 @@ require 'minitest/autorun'
 require 'tmpdir'
 require 'English'
 require_relative 'test__helper'
+require_relative '../lib/zold/version'
 
 # Zold main module test.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -52,7 +53,7 @@ class TestZold < Minitest::Test
 
   def test_show_version
     stdout = exec('--version')
-    assert(stdout.include?('0.0.0'))
+    assert(stdout.include?(Zold::VERSION))
   end
 
   def test_create_new_wallet

metadata

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