zold 0.13.34 → 0.13.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b72e9cbc1d475ad37e79d6f26dd0826702162b0a
-  data.tar.gz: 1a423d084caf176481696a30e800c30910681775
+  metadata.gz: d72a17dead59c9ae473afc46355b7189dccde252
+  data.tar.gz: cd9e2182faaae9ef62448e099bbe836246832fef
 SHA512:
-  metadata.gz: 017c6255d34f34f137acfb403a8e9123aba9442579b0824d50c63ab45f4aa739e120a629d1f39c72386e644c0b3861476a013acd851738e62f18a26c3c77f435
-  data.tar.gz: 8dd19ab2329b2c78abbe39ffb9f06e8d2cc0d37b2b675887627970368082137f2cdd9438dbfa3707321ad593d54688796fbf86d95b6ab223484f825eb7ac40bd
+  metadata.gz: c2e3e6e3d3d34fc1f0442397efbf4fceb6b269d8d7b4099cf46a70c130beb4f35fe53d2397c63d4032576d1fd10d3e448835e808a7b79149c1d364de06fc8b24
+  data.tar.gz: 2b8283cb8e7d7661cf002f24b6430dae1c5c1ec1ab522c02f1ef650aef425dfe24383f9fc7c80132d676ba9510154698bd6b82040b8eac92d5104906524c255f

data/.rubocop.yml

@@ -16,7 +16,7 @@ Metrics/AbcSize:
 Metrics/BlockLength:
   Max: 100
 Metrics/ClassLength:
-  Max: 200
+  Max: 250
 Layout/EndOfLine:
   EnforcedStyle: lf
 Metrics/ParameterLists:

data/README.md

@@ -87,6 +87,8 @@ $ zold push 5f96e731e48ae21f
 
 That's it.
 
+## How to Start a Node
+
 You also can contribute to Zold by running a node on your server.
 In order to do that just run (with your own wallet ID, of course):
 
@@ -145,6 +147,10 @@ with a lot of technical details. Here is the explanation of the majority of them
 The node is supposed to update update itself automatically (if you run it via `zold-nohup`)
 every time it discovers another node with a higher version.
 
+`network` is the name of the network the node belongs to.
+The production network's name is `zold`.
+For testing purposes you can start a node in a test network, using `--network=test`.
+
 `score` is the current score your node is exposing to the network now.
 All other nodes are using this information in order to decide how much
 they can trust your node with the information it provides, about wallets.
@@ -207,11 +213,6 @@ network. You can see the full list of nodes at `/remotes` URL of your node.
 further. The health of this point is critical to the entire node. Some
 numbers it includes must be watched carefully.
 
-  * `semaphores` is the amount of locks the server maintain, one per wallet.
-    The number may be large (>100), if the node has processed a lot of wallets
-    recently. If it's larger [than 1024](https://github.com/zold-io/zold/issues/199),
-    it's a good reason to worry.
-
 To be continued...
 
 `date` is the current date and time on the server.

data/bin/zold

@@ -97,6 +97,10 @@ Available options:"
     o.string '--home',
       "Home directory (default: #{Dir.pwd})",
       default: Dir.pwd
+    o.string '--network',
+      "The name of the network we work in (default: #{Zold::Wallet::MAIN_NETWORK}",
+      required: true,
+      default: Zold::Wallet::MAIN_NETWORK
     o.bool '-h', '--help', 'Show these instructions'
     o.bool '--trace', 'Show full stack trace in case of a problem'
     o.bool '--ignore-global-config', 'Don\'t read options from the ~/.zold file'
@@ -123,12 +127,13 @@ Available options:"
 
   args = opts.arguments
   args << '--help' if opts.help?
+  args << "--network=#{opts['network']}"
 
   FileUtils.mkdir_p(opts[:home])
   Dir.chdir(opts[:home])
 
   wallets = Zold::Wallets.new('.')
-  remotes = Zold::Remotes.new('./.zoldata/remotes')
+  remotes = Zold::Remotes.new('./.zoldata/remotes', network: opts['network'])
   copies = './.zoldata/copies'
 
   case command

data/fixtures/scripts/_head.sh

@@ -12,19 +12,21 @@ function reserve_port {
 function wait_for_port {
   while ! nc -z localhost $1; do
     ((p++)) || sleep 1
-    if ((p==10)); then
+    if ((p==30)); then
       echo Port $1 is not available after $p seconds of waiting
       exit -1
     fi
+    sleep 1
   done
 }
 
 function wait_for_file {
   while [ ! -f $1 ]; do
     ((c++)) || sleep 1
-    if ((c==10)); then
+    if ((c==30)); then
       echo File $1 not found, giving up after $c seconds of waiting
       exit -1
     fi
+    sleep 1
   done
 }

data/fixtures/scripts/push-and-pull.sh

@@ -28,7 +28,7 @@ zold show 0000000000000000
 zold taxes debt 0000000000000000
 
 zold remote show
-zold push 0000000000000000 --sync
+zold push 0000000000000000
 zold fetch 0000000000000000 --ignore-score-weakness
 zold diff 0000000000000000
 zold merge 0000000000000000

data/lib/zold/amount.rb

@@ -86,6 +86,11 @@ module Zold
       @coins <= other.to_i
     end
 
+    def <=>(other)
+      raise '<= may only work with Amount' unless other.is_a?(Amount)
+      @coins <=> other.to_i
+    end
+
     def +(other)
       raise '+ may only work with Amount' unless other.is_a?(Amount)
       Amount.new(coins: @coins + other.to_i)

data/lib/zold/atomic_file.rb

@@ -31,15 +31,15 @@ module Zold
     end
 
     def read
-      File.open(@file, 'r') do |f|
-        f.flock(File::LOCK_SH)
+      File.open(@file, 'rb') do |f|
+        f.flock(File::LOCK_EX)
         f.read
       end
     end
 
     def write(content)
       raise 'Content can\'t be nil' if content.nil?
-      File.open(@file, 'w+') do |f|
+      File.open(@file, 'wb') do |f|
         f.flock(File::LOCK_EX)
         f.write(content)
       end

data/lib/zold/backtrace.rb

@@ -30,7 +30,13 @@ module Zold
     end
 
     def to_s
-      "#{@error.class.name}: #{@error.message}\n#{@error.backtrace.join("\n\t")}"
+      [
+        @error.class.name,
+        ': ',
+        @error.message,
+        "\n\t",
+        @error.backtrace.select { |t| t.include?('zold/') }.join("\n\t")
+      ].join
     end
   end
 end

data/lib/zold/commands/clean.rb

@@ -50,7 +50,7 @@ Available options:"
       end
       mine = Args.new(opts, @log).take || return
       mine = @wallets.all if mine.empty?
-      mine.each do |id|
+      mine.map { |i| Id.new(i) }.each do |id|
         clean(Copies.new(File.join(@copies, id)), opts)
       end
     end

data/lib/zold/commands/create.rb

@@ -46,9 +46,9 @@ Available options:"
           require: true,
           default: '~/.ssh/id_rsa.pub'
         o.string '--network',
-          'The name of the network',
+          "The name of the network (default: #{Wallet::MAIN_NETWORK}",
           require: true,
-          default: 'zold'
+          default: Wallet::MAIN_NETWORK
         o.bool '--help', 'Print instructions'
       end
       mine = Args.new(opts, @log).take || return

data/lib/zold/commands/diff.rb

@@ -50,9 +50,9 @@ Available options:"
       mine = Args.new(opts, @log).take || return
       raise 'At least one wallet ID is required' if mine.empty?
       stdout = ''
-      mine.each do |id|
+      mine.map { |i| Id.new(i) }.each do |id|
         stdout += diff(
-          @wallets.find(Id.new(id)),
+          @wallets.find(id),
           Copies.new(File.join(@copies, id)),
           opts
         )

data/lib/zold/commands/fetch.rb

@@ -28,6 +28,7 @@ require_relative 'args'
 require_relative '../log'
 require_relative '../http'
 require_relative '../score'
+require_relative '../json_page'
 require_relative '../copies'
 
 # FETCH command.
@@ -58,7 +59,7 @@ Available options:"
       end
       mine = Args.new(opts, @log).take || return
       mine = @wallets.all if mine.empty?
-      mine.each do |id|
+      mine.map { |i| Id.new(i) }.each do |id|
         fetch(id, Copies.new(File.join(@copies, id)), opts)
       end
     end
@@ -68,10 +69,14 @@ Available options:"
     def fetch(id, cps, opts)
       total = 0
       nodes = 0
+      done = 0
       @remotes.iterate(@log) do |r|
-        total += fetch_one(id, r, cps, opts)
         nodes += 1
+        total += fetch_one(id, r, cps, opts)
+        done += 1
       end
+      raise "There are no remote nodes, run 'zold remote reset'" if nodes.zero?
+      raise "No nodes out of #{nodes} have the wallet #{id}" if done.zero?
       @log.debug("#{nodes} copies of #{id} fetched for the total score of #{total}, #{cps.all.count} local copies")
     end
 
@@ -84,11 +89,10 @@ Available options:"
       res = r.http("/wallet/#{id}").get
       raise "Wallet #{id} not found" if res.code == '404'
       r.assert_code(200, res)
-      json = JSON.parse(res.body)
+      json = JsonPage.new(res.body).to_hash
       score = Score.parse_json(json['score'])
       r.assert_valid_score(score)
       r.assert_score_ownership(score)
-      r.assert_score_strength(score)
       r.assert_score_strength(score) unless opts['ignore-score-weakness']
       Tempfile.open do |f|
         body = json['body']

data/lib/zold/commands/merge.rb

@@ -53,9 +53,9 @@ Available options:"
       mine = Args.new(opts, @log).take || return
       mine = @wallets.all if mine.empty?
       modified = []
-      mine.each do |id|
-        next unless merge(Id.new(id), Copies.new(File.join(@copies, id)), opts)
-        modified << Id.new(id)
+      mine.map { |i| Id.new(i) }.each do |id|
+        next unless merge(id, Copies.new(File.join(@copies, id)), opts)
+        modified << id
         require_relative 'propagate'
         modified += Propagate.new(wallets: @wallets, log: @log).run(args)
       end

data/lib/zold/commands/node.rb

@@ -23,10 +23,14 @@ require_relative '../version'
 require_relative '../score'
 require_relative '../backtrace'
 require_relative '../metronome'
+require_relative '../wallet'
 require_relative '../wallets'
 require_relative '../remotes'
 require_relative '../verbose_thread'
 require_relative '../node/entrance'
+require_relative '../node/safe_entrance'
+require_relative '../node/spread_entrance'
+require_relative '../node/async_entrance'
 require_relative '../node/front'
 require_relative '../node/farm'
 require_relative 'pull'
@@ -104,6 +108,10 @@ module Zold
         o.string '--private-key',
           'The location of RSA private key (default: ~/.ssh/id_rsa)',
           default: '~/.ssh/id_rsa'
+        o.string '--network',
+          "The name of the network (default: #{Wallet::MAIN_NETWORK})",
+          require: true,
+          default: Wallet::MAIN_NETWORK
         o.bool '--help', 'Print instructions'
       end
       if opts.help?
@@ -125,6 +133,7 @@ module Zold
       @log.info("Home directory: #{Dir.pwd}")
       @log.info("Ruby version: #{RUBY_VERSION}")
       @log.info("Zold gem version: #{Zold::VERSION}")
+      @log.info("Network ID: #{opts['network']}")
       host = opts[:host] || ip
       address = "#{host}:#{opts[:port]}".downcase
       @log.info("Node location: #{address}")
@@ -138,12 +147,11 @@ module Zold
         @log.debug('Running in standalone mode! (will never talk to other remotes)')
       end
       Front.set(:ignore_score_weakness, opts['ignore-score-weakness'])
+      Front.set(:network, opts['network'])
       Front.set(:wallets, @wallets)
       Front.set(:remotes, @remotes)
       Front.set(:copies, @copies)
       Front.set(:address, address)
-      entrance = Entrance.new(@wallets, @remotes, @copies, address, log: @log)
-      Front.set(:entrance, entrance)
       Front.set(:root, Dir.pwd)
       Front.set(:port, opts['bind-port'])
       Front.set(:reboot, !opts['never-reboot'])
@@ -154,24 +162,37 @@ module Zold
         require_relative 'invoice'
         invoice = Invoice.new(wallets: @wallets, log: @log).run(['invoice', invoice])
       end
-      farm = Farm.new(invoice, File.join(Dir.pwd, 'farm'), log: @log)
-      farm.start(host, opts[:port], threads: opts[:threads], strength: opts[:strength]) do
-        Front.set(:farm, farm)
-        metronome(farm, entrance, opts).start do |metronome|
-          Front.set(:metronome, metronome)
-          @log.info("Starting up the web front at http://#{host}:#{opts[:port]}...")
-          Front.run!
-          @log.info("The web front stopped at http://#{host}:#{opts[:port]}")
+      SafeEntrance.new(
+        AsyncEntrance.new(
+          SpreadEntrance.new(
+            Entrance.new(@wallets, @remotes, @copies, address, log: @log),
+            @wallets, @remotes, address,
+            log: @log,
+            ignore_score_weakeness: opts['ignore-score-weakness']
+          ), log: @log
+        ), network: opts['network']
+      ).start do |entrance|
+        Front.set(:entrance, entrance)
+        Farm.new(invoice, File.join(Dir.pwd, 'farm'), log: @log)
+          .start(host, opts[:port], threads: opts[:threads], strength: opts[:strength]) do |farm|
+          Front.set(:farm, farm)
+          metronome(farm, entrance, opts).start do |metronome|
+            Front.set(:metronome, metronome)
+            @log.info("Starting up the web front at http://#{host}:#{opts[:port]}...")
+            Front.run!
+            @log.info("The web front stopped at http://#{host}:#{opts[:port]}")
+          end
         end
       end
+      @log.info("The node #{host}:#{opts[:port]} is shut down, thanks for helping Zold network!")
     end
 
     private
 
     # Returns exit code
     def exec(cmd, nohup_log)
+      start = Time.now
       Open3.popen2e(cmd) do |stdin, stdout, thr|
-        start = Time.now
         nohup_log.print("Started process ##{thr.pid} from process ##{Process.pid}: #{cmd}\n")
         stdin.close
         until stdout.eof?

data/lib/zold/commands/propagate.rb

@@ -48,7 +48,7 @@ Available options:"
       mine = Args.new(opts, @log).take || return
       mine = @wallets.all if mine.empty?
       modified = []
-      mine.each do |id|
+      mine.map { |i| Id.new(i) }.each do |id|
         modified += propagate(@wallets.find(id), opts)
       end
       modified

data/lib/zold/commands/push.rb

@@ -26,6 +26,7 @@ require_relative 'args'
 require_relative '../log'
 require_relative '../id'
 require_relative '../http'
+require_relative '../json_page'
 require_relative '../atomic_file'
 
 # PUSH command.
@@ -45,18 +46,18 @@ module Zold
       opts = Slop.parse(args, help: true, suppress_errors: true) do |o|
         o.banner = "Usage: zold push [ID...] [options]
 Available options:"
+        o.bool '--ignore-score-weakness',
+          'Don\'t complain when their score is too weak',
+          default: false
         o.array '--ignore-node',
           'Ignore this node and don\'t push to it',
           default: []
-        o.bool '--sync',
-          'Wait until the server confirms merge and pushes all wallets further (default: false)',
-          default: false
         o.bool '--help', 'Print instructions'
       end
       mine = Args.new(opts, @log).take || return
       mine = @wallets.all if mine.empty?
-      mine.each do |id|
-        wallet = @wallets.find(Id.new(id))
+      mine.map { |i| Id.new(i) }.each do |id|
+        wallet = @wallets.find(id)
         raise "The wallet #{id} is absent" unless wallet.exists?
         push(wallet, opts)
       end
@@ -67,11 +68,15 @@ Available options:"
     def push(wallet, opts)
       total = 0
       nodes = 0
+      done = 0
       @remotes.iterate(@log) do |r|
-        total += push_one(wallet, r, opts)
         nodes += 1
+        total += push_one(wallet, r, opts)
+        done += 1
       end
-      @log.info("Push finished to #{nodes} nodes, total score for #{wallet.id} is #{total}")
+      raise "There are no remote nodes, run 'zold remote reset'" if nodes.zero?
+      raise "No nodes out of #{nodes} accepted the wallet #{wallet.id}" if done.zero?
+      @log.info("Push finished to #{done} nodes out of #{nodes}, total score for #{wallet.id} is #{total}")
     end
 
     def push_one(wallet, r, opts)
@@ -87,11 +92,11 @@ Available options:"
         return 0
       end
       r.assert_code(200, response)
-      json = JSON.parse(response.body)
+      json = JsonPage.new(response.body).to_hash
       score = Score.parse_json(json['score'])
       r.assert_valid_score(score)
       r.assert_score_ownership(score)
-      r.assert_score_strength(score)
+      r.assert_score_strength(score) unless opts['ignore-score-weakness']
       @log.info("#{r} accepted #{content.length}b/#{wallet.txns.count}t of #{wallet.id} \
 in #{(Time.now - start).round(2)}s: #{Rainbow(score.value).green} (#{json['version']})")
       score.value

data/lib/zold/commands/remote.rb

@@ -27,6 +27,7 @@ require 'time'
 require_relative 'args'
 require_relative '../node/farm'
 require_relative '../log'
+require_relative '../json_page'
 require_relative '../http'
 require_relative '../remotes'
 require_relative '../score'
@@ -152,7 +153,8 @@ Available options:"
       @remotes.iterate(@log, farm: @farm) do |r|
         res = r.http('/').get
         r.assert_code(200, res)
-        score = Score.parse_json(JSON.parse(res.body)['score'])
+        json = JsonPage.new(res.body).to_hash
+        score = Score.parse_json(json['score'])
         r.assert_valid_score(score)
         r.assert_score_ownership(score)
         r.assert_score_strength(score) unless opts['ignore-score-weakness']
@@ -181,7 +183,7 @@ Available options:"
         start = Time.now
         res = r.http('/remotes').get
         r.assert_code(200, res)
-        json = JSON.parse(res.body)
+        json = JsonPage.new(res.body).to_hash
         score = Score.parse_json(json['score'])
         r.assert_valid_score(score)
         r.assert_score_ownership(score)