zold 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 295d14430d8ebdd3388c4389ac84aa4690ea589d
-  data.tar.gz: 7f63a6461a39f5b4f14486d4ef2cf7ccf8a19795
+  metadata.gz: f998b2457e50fdca35b6c4ac18869a059aa3989b
+  data.tar.gz: 495db441ee37e8c7d4e3eb05554147bb720c1e45
 SHA512:
-  metadata.gz: '008090bc5576401be63bb0366996f1c3e8509299d0ef9fdc691e513ee13c384fb83f35f9053294911787e50e774b8a8baa8b61525b96ea5ee186705ef24dfb5d'
-  data.tar.gz: a0d184623087e94ec76bf33ce0954c010de8f3d5793d8638bdd2a2a2209741f7f1f4f9360ae6cbd104e935f5b1b96109e94eb8794ad24104e991464b0fffd92d
+  metadata.gz: 1ca78d5d43939e532d2e006e107165bb16e8daf091fe3c0da36f62758a5025261d3af405798ce6ff4d4188791a9af8cde2c6cac4be89c0366c204f19446f4d76
+  data.tar.gz: 2fd4122ff59c126eb7ac7796391b7bcc6f509e5d0eb2a028609f7d29be7833f5640a122cad7296f2938f16626817467e38ad029971be91279e57995ae1166b3b

data/Procfile

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

data/bin/zold

@@ -86,8 +86,8 @@ Available commands:
       Generate score for the given host and port
 Available options:"
     o.string '-d', '--dir',
-      'The directory where wallets are stored (default: current directory)',
-      default: '.'
+      'The directory where wallets are stored (default: .)',
+      default: Dir.pwd
     o.string '--private-key',
       'The location of RSA private key (default: ~/.ssh/id_rsa)',
       default: '~/.ssh/id_rsa'
@@ -120,8 +120,8 @@ Available options:"
   args = args[(args.index(command) + 1)..-1]
 
   wallets = Zold::Wallets.new(opts['dir'])
-  remotes = Zold::Remotes.new(File.join(opts['dir'], '.zold/remotes'))
-  copies = File.join(opts['dir'], '.zold/copies')
+  remotes = Zold::Remotes.new(File.join(opts['dir'], '.zoldata/remotes'))
+  copies = File.join(opts['dir'], '.zoldata/copies')
 
   case command
   when 'node'

data/fixtures/scripts/print-helps.sh

@@ -11,5 +11,3 @@ for c in "${commands[@]}"
 do
   zold --trace $c --help
 done
-
-echo 'DONE'

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

@@ -9,7 +9,7 @@ port=`python -c 'import socket; s=socket.socket(); s.bind(("", 0)); print(s.gets
 
 mkdir server
 cd server
-zold node --host=localhost --port=${port} --bind-port=${port} --threads=0 &
+zold --trace node --host=localhost --port=${port} --bind-port=${port} --threads=0 --standalone &
 pid=$!
 trap "kill -9 $pid" EXIT
 cd ..
@@ -18,22 +18,21 @@ while ! nc -z localhost ${port}; do
   sleep 0.1
 done
 
-zold remote clean
-zold remote add localhost ${port}
-zold remote show
+zold --trace remote clean
+zold --trace remote add localhost ${port}
+zold --trace remote show
 
-zold --public-key id_rsa.pub create 0000000000000000
+zold --trace --public-key id_rsa.pub create 0000000000000000
 target=`zold --public-key id_rsa.pub create`
 invoice=`zold invoice ${target}`
-zold --private-key id_rsa pay 0000000000000000 ${invoice} 14.99 'To save the world!'
-zold propagate 0000000000000000
-zold show
-zold show 0000000000000000
-
-zold push 0000000000000000
-zold fetch 0000000000000000 --ignore-score-weakness
-zold diff 0000000000000000
-zold merge 0000000000000000
-zold clean 0000000000000000
-
-echo 'DONE'
+zold --trace --private-key id_rsa pay 0000000000000000 ${invoice} 14.99 'To save the world!'
+zold --trace propagate 0000000000000000
+zold --trace show
+zold --trace show 0000000000000000
+
+zold --trace remote show
+zold --trace push 0000000000000000
+zold --trace fetch 0000000000000000 --ignore-score-weakness
+zold --trace diff 0000000000000000
+zold --trace merge 0000000000000000
+zold --trace clean 0000000000000000

data/lib/zold/commands/fetch.rb

@@ -47,6 +47,9 @@ 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 fetch from it',
+          default: []
         o.bool '--help', 'Print instructions'
       end
       if opts.help?
@@ -62,40 +65,50 @@ Available options:"
     def fetch(id, cps, opts)
       total = 0
       @remotes.all.each do |r|
-        uri = URI("#{r[:home]}wallet/#{id}")
-        res = Http.new(uri).get
-        unless res.code == '200'
-          @log.error("#{r[:host]}:#{r[:port]} \
-#{Rainbow(res.code).red}/#{res.message} at #{uri}")
-          next
-        end
-        json = JSON.parse(res.body)
-        score = Score.new(
-          Time.parse(json['score']['time']),
-          r[:host],
-          r[:port],
-          json['score']['suffixes']
+        total += 1 if fetch_one(id, r, cps, opts)
+      end
+      @log.debug("#{total} copies fetched, \
+there are #{cps.all.count} available locally")
+    end
+
+    def fetch_one(id, r, cps, opts)
+      address = "#{r[:host]}:#{r[:port]}".downcase
+      if opts['ignore-node'].include?(address)
+        @log.info("#{address} ignored because of --ignore-node")
+        return false
+      end
+      uri = URI("#{r[:home]}wallet/#{id}")
+      res = Http.new(uri).get
+      unless res.code == '200'
+        @log.error(
+          "#{address} #{Rainbow(res.code).red}/#{res.message} at #{uri}"
         )
-        unless score.valid?
-          @log.error("#{r[:host]}:#{r[:port]} invalid score")
-          next
-        end
-        if score.strength < Score::STRENGTH && !opts['ignore-score-weakness']
-          @log.error(
-            "#{r[:host]}:#{r[:port]} score is too weak: #{score.strength} \
+        return false
+      end
+      json = JSON.parse(res.body)
+      score = Score.new(
+        Time.parse(json['score']['time']),
+        r[:host],
+        r[:port],
+        json['score']['suffixes']
+      )
+      unless score.valid?
+        @log.error("#{address} invalid score")
+        return false
+      end
+      if score.strength < Score::STRENGTH && !opts['ignore-score-weakness']
+        @log.error(
+          "#{address} score is too weak: #{score.strength} \
 (<#{Score::STRENGTH})"
-          )
-          next
-        end
-        total += 1
-        cps.add(json['body'], r[:host], r[:port], score.value)
-        @log.info(
-          "#{r[:host]}:#{r[:port]} #{json['body'].length}b/\
-#{Rainbow(score.value).green} (v.#{json['version']})"
         )
+        return false
       end
-      @log.debug("#{total} copies fetched, \
-there are #{cps.all.count} available locally")
+      cps.add(json['body'], r[:host], r[:port], score.value)
+      @log.info(
+        "#{address} #{json['body'].length}b/\
+#{Rainbow(score.value).green} (v.#{json['version']})"
+      )
+      true
     end
   end
 end

data/lib/zold/commands/merge.rb

@@ -37,6 +37,7 @@ module Zold
       @log = log
     end
 
+    # Returns the array of modified wallets (IDs)
     def run(args = [])
       opts = Slop.parse(args, help: true) do |o|
         o.banner = "Usage: zold merge [ID...] [options]
@@ -48,12 +49,15 @@ Available options:"
         return
       end
       raise 'At least one wallet ID is required' if opts.arguments.empty?
+      modified = []
       opts.arguments.each do |id|
         wallet = @wallets.find(Id.new(id))
-        merge(wallet, Copies.new(File.join(@copies, id)), opts)
+        next unless merge(wallet, Copies.new(File.join(@copies, id)), opts)
+        modified << Id.new(id)
         require_relative 'propagate'
-        Propagate.new(wallets: @wallets, log: @log).run(args)
+        modified += Propagate.new(wallets: @wallets, log: @log).run(args)
       end
+      modified
     end
 
     def merge(wallet, cps, _)
@@ -64,8 +68,13 @@ Available options:"
       cps[1..-1].each do |c|
         patch.join(Wallet.new(c[:path]))
       end
-      patch.save(wallet.path, overwrite: true)
-      @log.debug("Merged successfully into #{wallet.path}")
+      modified = patch.save(wallet.path, overwrite: true)
+      if modified
+        @log.debug("Merged successfully into #{wallet.path}")
+      else
+        @log.debug("Nothing changed in #{wallet.path} after merge")
+      end
+      modified
     end
   end
 end

data/lib/zold/commands/node.rb

@@ -44,7 +44,7 @@ module Zold
           default: Remotes::PORT
         o.string '--host', 'Host name (default: 127.0.0.1)',
           default: '127.0.0.1'
-        o.string '--home', 'Home directory (default: current directory)',
+        o.string '--home', 'Home directory (default: .)',
           default: Dir.pwd
         o.integer '--strength',
           "The strength of the score (default: #{Score::STRENGTH})",
@@ -52,6 +52,9 @@ module Zold
         o.integer '--threads',
           'How many threads to use for scores finding (default: 8)',
           default: 8
+        o.bool '--standalone',
+          'Never communicate with other nodes (mostly for testing)',
+          default: false
         o.bool '--help', 'Print instructions'
       end
       if opts.help?
@@ -66,9 +69,20 @@ module Zold
         Logger: WebrickLog.new(@log),
         AccessLog: []
       )
+      if opts['standalone']
+        Zold::Front.set(:remotes, Remotes::Empty.new)
+      else
+        Zold::Front.set(
+          :remotes,
+          Remotes.new(
+            File.join(opts[:home], '.zoldata/remotes')
+          )
+        )
+      end
       Zold::Front.set(:port, opts['bind-port'])
       FileUtils.mkdir_p(opts[:home])
       Zold::Front.set(:home, opts[:home])
+      Zold::Front.set(:me, "#{opts[:host]}:#{opts[:port]}".downcase)
       farm = Farm.new(log: @log)
       farm.start(
         opts[:host], opts[:port],

data/lib/zold/commands/propagate.rb

@@ -35,6 +35,7 @@ module Zold
       @log = log
     end
 
+    # Returns list of Wallet IDs which were affected
     def run(args = [])
       opts = Slop.parse(args, help: true) do |o|
         o.banner = "Usage: zold propagate [ID...] [options]
@@ -46,13 +47,17 @@ Available options:"
         return
       end
       raise 'At least one wallet ID is required' if opts.arguments.empty?
+      modified = []
       opts.arguments.each do |id|
-        propagate(@wallets.find(id), opts)
+        modified += propagate(@wallets.find(id), opts)
       end
+      modified
     end
 
+    # Returns list of Wallet IDs which were affected
     def propagate(wallet, _)
       me = wallet.id
+      modified = []
       wallet.txns.select { |t| t.amount.negative? }.each do |t|
         target = @wallets.find(t.bnf)
         unless target.exists?
@@ -66,8 +71,12 @@ Available options:"
         end
         target.add(t.inverse(me))
         @log.info("#{t.amount.mul(-1)} to #{t.bnf}")
+        modified << t.id
       end
-      @log.debug("Wallet #{me} propagated successfully")
+      modified.uniq!
+      @log.debug("Wallet #{me} propagated successfully, \
+#{modified.count} wallets affected")
+      modified
     end
   end
 end

data/lib/zold/commands/push.rb

@@ -19,6 +19,7 @@
 # SOFTWARE.
 
 require 'slop'
+require 'json'
 require 'net/http'
 require_relative '../log'
 require_relative '../id'
@@ -55,13 +56,26 @@ Available options:"
 
     def push(wallet, _)
       raise 'The wallet is absent' unless wallet.exists?
-      remote = @remotes.all[0]
-      uri = URI("#{remote[:home]}wallet/#{wallet.id}")
-      response = Http.new(uri).put(File.read(wallet.path))
-      unless response.code == '200'
-        raise "Failed to push to #{uri}: #{response.code}/#{response.message}"
+      total = 0
+      @remotes.all.each do |r|
+        uri = URI("#{r[:home]}wallet/#{wallet.id}")
+        response = Http.new(uri).put(File.read(wallet.path))
+        if response.code != '304' && response.code != '200'
+          @log.error("#{uri} failed as #{response.code}/#{response.message}")
+          next
+        end
+        json = JSON.parse(response.body)['score']
+        score = Score.new(
+          Time.parse(json['time']), json['host'],
+          json['port'], json['suffixes']
+        )
+        unless score.valid?
+          @log.error("#{uri} invalid score")
+          next
+        end
+        total += score.value
       end
-      @log.info("The #{wallet.id} pushed to #{uri}")
+      @log.info("Total score is #{total}")
     end
   end
 end

data/lib/zold/http.rb

@@ -40,7 +40,6 @@ module Zold
     def get
       http = Net::HTTP.new(@uri.host, @uri.port)
       http.read_timeout = 5
-      http.continue_timeout = 5
       return http.request_get(@uri.path, headers)
     rescue StandardError => e
       return Net::HTTPServerError.new('1.1', '599', e.message)
@@ -48,11 +47,13 @@ module Zold
 
     def put(body)
       http = Net::HTTP.new(@uri.host, @uri.port)
-      http.read_timeout = 5
-      http.continue_timeout = 5
+      http.read_timeout = 60
       return http.request_put(
         @uri.path, body,
-        headers.merge('Content-Type': 'text/plain')
+        headers.merge(
+          'Content-Type': 'text/plain',
+          'Content-Length': body.length.to_s
+        )
       )
     rescue StandardError => e
       return Net::HTTPServerError.new('1.1', '599', e.message)

data/lib/zold/node/front.rb

@@ -50,12 +50,13 @@ module Zold
       set :log, Log.new
       set :show_exceptions, false
       set :home, Dir.pwd
+      set :me, 'localhost:4096'
       set :farm, Farm.new
       set :server, 'webrick'
     end
 
     before do
-      if request.env[Http::SCORE_HEADER]
+      if request.env[Http::SCORE_HEADER] && !settings.remotes.empty?
         s = Score.parse(request.env[Http::SCORE_HEADER])
         error(400, 'The score is invalid') unless s.valid?
         error(400, 'The score is weak') if s.strength < Score::STRENGTH
@@ -85,7 +86,7 @@ module Zold
         wallets: wallets.all.count,
         farm: settings.farm.to_json,
         date: `date  --iso-8601=seconds -u`.strip,
-        age: (Time.now - settings.start) / (60 * 60),
+        hours_alive: ((Time.now - settings.start) / (60 * 60)).round(2),
         home: 'https://www.zold.io'
       )
     end
@@ -106,20 +107,38 @@ module Zold
       id = Id.new(params[:id])
       wallet = wallets.find(id)
       request.body.rewind
+      body = request.body.read
+      if wallet.exists? && File.read(wallet.path) == body
+        status 304
+        return JSON.pretty_generate(
+          version: VERSION, score: score.to_h
+        )
+      end
       cps = copies(id)
-      cps.add(request.body.read, 'remote', Remotes::PORT, 0)
+      cps.add(body, 'remote', Remotes::PORT, 0)
       require_relative '../commands/fetch'
       Zold::Fetch.new(
-        remotes: remotes, copies: cps.root,
+        remotes: settings.remotes, copies: cps.root,
         log: settings.log
-      ).run([id.to_s])
+      ).run([id.to_s, "--ignore-node=#{settings.me}"])
       require_relative '../commands/merge'
-      Zold::Merge.new(
+      modified = Zold::Merge.new(
         wallets: wallets, copies: cps.root,
         log: settings.log
       ).run([id.to_s])
       cps.remove('remote', Remotes::PORT)
-      "Success, #{wallet.id} balance is #{wallet.balance}"
+      modified.each do |m|
+        Zold::Push.new(
+          wallets: wallets, remotes: settings.remotes,
+          log: settings.log
+        ).run([m.to_s])
+      end
+      JSON.pretty_generate(
+        version: VERSION,
+        score: score.to_h,
+        balance: wallet.balance,
+        modified: modified.count
+      )
     end
 
     get '/remotes' do
@@ -127,7 +146,7 @@ module Zold
       JSON.pretty_generate(
         version: VERSION,
         score: score.to_h,
-        all: remotes.all.map do |r|
+        all: settings.remotes.all.map do |r|
           {
             host: r[:host],
             port: r[:port]
@@ -158,11 +177,7 @@ module Zold
     private
 
     def copies(id)
-      Copies.new(File.join(settings.home, ".zold/copies/#{id}"))
-    end
-
-    def remotes
-      Remotes.new(File.join(settings.home, '.zold/remotes'))
+      Copies.new(File.join(settings.home, ".zoldata/copies/#{id}"))
     end
 
     def wallets

data/lib/zold/patch.rb

@@ -49,10 +49,15 @@ module Zold
       end
     end
 
+    # Returns TRUE if the file was actually modified
     def save(file, overwrite: false)
+      before = ''
+      before = File.read(file) if File.exist?(file)
       wallet = Zold::Wallet.new(file)
       wallet.init(@id, @key, overwrite: overwrite)
       @txns.each { |t| wallet.add(t) }
+      after = File.read(file)
+      before != after
     end
   end
 end

data/lib/zold/remotes.rb

@@ -31,12 +31,15 @@ module Zold
   class Remotes
     PORT = 4096
 
-    def initialize(file)
-      @file = file
+    # Empty, for standalone mode
+    class Empty
+      def all
+        []
+      end
     end
 
-    def total
-      load.length
+    def initialize(file)
+      @file = file
     end
 
     def all
@@ -56,7 +59,8 @@ module Zold
     end
 
     def exists?(host, port = Remotes::PORT)
-      !load.find { |r| r[:host] == host && r[:port] == port }.nil?
+      raise 'Port has to be of type Integer' unless port.is_a?(Integer)
+      !load.find { |r| r[:host] == host.downcase && r[:port] == port }.nil?
     end
 
     def add(host, port = Remotes::PORT)
@@ -64,7 +68,7 @@ module Zold
       raise 'Port can\'t be negative' if port < 0
       raise 'Port can\'t be over 65536' if port > 0xffff
       list = load
-      list << { host: host, port: port, score: 0 }
+      list << { host: host.downcase, port: port, score: 0 }
       list.uniq! { |r| "#{r[:host]}:#{r[:port]}" }
       save(list)
     end
@@ -72,20 +76,20 @@ module Zold
     def remove(host, port = Remotes::PORT)
       raise 'Port has to be of type Integer' unless port.is_a?(Integer)
       list = load
-      list.reject! { |r| r[:host] == host && r[:port] == port }
+      list.reject! { |r| r[:host] == host.downcase && r[:port] == port }
       save(list)
     end
 
     def score(host, port = Remotes::PORT)
       raise 'Port has to be of type Integer' unless port.is_a?(Integer)
-      load.find { |r| r[:host] == host && r[:port] == port }[:score]
+      load.find { |r| r[:host] == host.downcase && r[:port] == port }[:score]
     end
 
     def rescore(host, port, score)
       raise 'Port has to be of type Integer' unless port.is_a?(Integer)
       list = load
       list.find do |r|
-        r[:host] == host && r[:port] == port
+        r[:host] == host.downcase && r[:port] == port
       end[:score] = score
       save(list)
     end

data/lib/zold/version.rb

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

data/test/commands/test_merge.rb

@@ -54,10 +54,12 @@ class TestMerge < Minitest::Test
       copies = Zold::Copies.new(File.join(dir, "copies/#{id}"))
       copies.add(File.read(first.path), 'host-1', 80, 5)
       copies.add(File.read(second.path), 'host-2', 80, 5)
-      Zold::Merge.new(
+      modified = Zold::Merge.new(
         wallets: Zold::Wallets.new(dir),
         copies: copies.root
       ).run([id.to_s])
+      assert(1, modified.count)
+      assert(id, modified[0])
     end
   end
 
@@ -78,10 +80,12 @@ class TestMerge < Minitest::Test
       copies = Zold::Copies.new(File.join(dir, "copies/#{id}"))
       copies.add(File.read(first.path), 'host-1', 80, 5)
       copies.add(File.read(second.path), 'host-2', 80, 5)
-      Zold::Merge.new(
+      modified = Zold::Merge.new(
         wallets: Zold::Wallets.new(dir),
         copies: copies.root
       ).run([id.to_s])
+      assert(1, modified.count)
+      assert(id, modified[0])
     end
   end
 end

data/test/test_patch.rb

@@ -52,7 +52,7 @@ class TestPatch < Minitest::Test
       patch.join(second)
       patch.join(third)
       FileUtils.rm(first.path)
-      patch.save(first.path)
+      assert_equal(true, patch.save(first.path))
       assert_equal(Zold::Amount.new(zld: -53), first.balance)
     end
   end

data/test/test_remotes.rb

@@ -34,7 +34,7 @@ class TestRemotes < Minitest::Test
       remotes = Zold::Remotes.new(file)
       remotes.add('127.0.0.1')
       remotes.add('127.0.0.1')
-      assert(remotes.total == 1, "#{remotes.total} is not equal to 1")
+      assert(1, remotes.all.count)
     end
   end
 
@@ -44,9 +44,9 @@ class TestRemotes < Minitest::Test
       FileUtils.touch(file)
       remotes = Zold::Remotes.new(file)
       remotes.add('127.0.0.1')
-      remotes.add('localhost', 433)
+      remotes.add('LOCALHOST', 433)
       remotes.remove('localhost', 433)
-      assert(remotes.total == 1, "#{remotes.total} is not equal to 1")
+      assert(1, remotes.all.count)
     end
   end
 
@@ -55,7 +55,7 @@ class TestRemotes < Minitest::Test
       remotes = Zold::Remotes.new(File.join(dir, 'remotes'))
       remotes.clean
       remotes.reset
-      assert(!remotes.total.zero?)
+      assert(!remotes.all.empty?)
     end
   end
 

metadata

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