zold 0.13.40 → 0.13.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 578bc522cfcaed922a3440d80d38f95a69af7977
-  data.tar.gz: 2e23c53f4812f19e33d0c4120c79c1361b2f9c9b
+  metadata.gz: cfad31c18d9d2a2cd394ad6048f510f0fd641829
+  data.tar.gz: 015adb1359b0b211176952d87bd273083a4e75e5
 SHA512:
-  metadata.gz: 661e61e5f36b391b0c1815a3fa9032aacb8f52ab173b71e079bbc011e89b8abc7a38b9223b57ecbd30d517abd34ea6621c5faa7cbb4ae8ffbf9bf6ac7fc9b6d1
-  data.tar.gz: 75d126c26de193a5b7e3646db1f9922602be31536acfeab6e46f24f869e4d398041bb340d0c541148c602478988f2d08dde9e433ccbc8ed02bb1902f3444df4b
+  metadata.gz: d5f085be6e9bb8fcdda41456aa2b45b23ea0202ef31c418190b34cec2e4a09f62e7c3f84d562e3933f827e0dd4909a7185bef76bf050566c42b88b62ed24767f
+  data.tar.gz: 122dba33d6bbc9de48af9e588873d7d5f7b00b7be6dcd9bedff4281bd3fcde478b0df38138a5785fb0e56a24783511d65762c1cbbd2f2074a59197945f249c3b

data/lib/zold/commands/remote.rb

@@ -31,6 +31,7 @@ require_relative '../json_page'
 require_relative '../http'
 require_relative '../remotes'
 require_relative '../score'
+require_relative '../wallet'
 
 # REMOTE command.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -78,6 +79,10 @@ Available options:"
         o.bool '--skip-ping',
           'Don\'t ping back the node when adding it (not recommended)',
           default: false
+        o.string '--network',
+          "The name of the network we work in (default: #{Wallet::MAIN_NETWORK}",
+          required: true,
+          default: Wallet::MAIN_NETWORK
         o.bool '--reboot',
           'Exit if any node reports version higher than we have',
           default: false
@@ -130,8 +135,8 @@ Available options:"
 
     def add(host, port, opts)
       unless opts['skip-ping']
-        res = Http.new("http://#{host}:#{port}/version").get
-        raise "The node #{host}:#{port} is not responding" unless res.code == '200'
+        res = Http.new("http://#{host}:#{port}/version", network: opts['network']).get
+        raise "The node #{host}:#{port} is not responding (code is #{res.code})" unless res.code == '200'
       end
       if @remotes.exists?(host, port)
         raise "#{host}:#{port} already exists in the list" unless opts['force']

data/lib/zold/http.rb

@@ -58,8 +58,8 @@ module Zold
 
     def get
       http = Net::HTTP.new(@uri.host, @uri.port)
-      http.read_timeout = 5
-      http.open_timeout = 5
+      http.read_timeout = 8
+      http.open_timeout = 4
       path = @uri.path
       path += '?' + @uri.query if @uri.query
       http.request_get(path, headers)
@@ -69,8 +69,8 @@ module Zold
 
     def put(body)
       http = Net::HTTP.new(@uri.host, @uri.port)
-      http.open_timeout = 5
-      http.read_timeout = 10
+      http.read_timeout = 16
+      http.open_timeout = 4
       path = @uri.path
       path += '?' + @uri.query if @uri.query
       http.request_put(

data/lib/zold/node/front.rb

@@ -43,7 +43,7 @@ module Zold
     configure do
       set :bind, '0.0.0.0'
       set :suppress_messages, true
-      set :dump_errors, true
+      set :dump_errors, false
       set :start, Time.now
       set :lock, false
       set :show_exceptions, false
@@ -81,7 +81,7 @@ module Zold
         if s.value > 3
           require_relative '../commands/remote'
           Remote.new(remotes: settings.remotes, log: settings.log).run(
-            ['remote', 'add', s.host, s.port.to_s, '--force']
+            ['remote', 'add', s.host, s.port.to_s, '--force', "--network=#{settings.network}"]
           )
         else
           settings.log.debug("#{request.url}: the score is too weak: #{s}")

data/lib/zold/patch.rb

@@ -75,7 +75,7 @@ module Zold
             next
           end
           if @txns.map(&:amount).map(&:to_i).inject(&:+).to_i < txn.amount.to_i * -1 && !wallet.root?
-            @log.error("Transaction ##{txn.id} attempts to make the balance negative: #{txn.to_text}")
+            @log.error("Transaction ##{txn.id} attempts to make the balance of #{wallet.id} negative: #{txn.to_text}")
             next
           end
           unless Signature.new.valid?(@key, wallet.id, txn)

data/lib/zold/version.rb

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

metadata

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