zold 0.11.14 → 0.11.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6e2499c65eb639ec4dd6a1177e4cf6186269688
-  data.tar.gz: c5482c8cb8b66a97f097626009ee0b461a57cc19
+  metadata.gz: ca4077a7a79a8ff6e6cc6ca27ebeda18571a3b7a
+  data.tar.gz: b5259cec4a2a73e33be07e387466a3b020d30be7
 SHA512:
-  metadata.gz: 6e0cad7598ca9560cfde7a8a7e9cc3ffb53065931c063e0f7ff69d8668e489d9a72f795707ee931a1ddf5715340fb38bb160a56fd366ae239aa368fb094340d3
-  data.tar.gz: 423b9534d67f3479accfcc33db73818c9574161c21131d62dae5b149179394da25ce9812dcf196bfc89412984f2b846e62dcc89926d00e9fc6881e0cf10f752c
+  metadata.gz: 4251510624adf3efade782f91cf3ba44bccbd1dfd2561da972253abbd3ab0aff08940c57a66e642a25ea5d42c706167d892babb1871bf8fbe25f684a4fd48da9
+  data.tar.gz: 27a737d9cccff7cd12c97ff096b69860ee0542f01f2a33908d05bbce0828429d847b6ca12c1d71c03f3273ed83196cfccc18f056a71ec4c972cdef605c829342

data/INSTALL.md

@@ -14,16 +14,16 @@ then the [gem](https://rubygems.org/gems/zold).
 
 ```bash
 $ sudo apt update -y
-$ sudo apt install -y ruby-dev rubygems zlib1g-dev libssl-dev make
-$ gem install zold
+$ sudo apt install -y ruby-dev rubygems zlib1g-dev libssl-dev make build-essential
+$ gem install --no-ri --no-rdoc zold
 ```
 
 ## Ubuntu 16.04
 
 ```bash
 $ sudo apt-get update -y
-$ sudo apt-get install -y ruby-dev rubygems zlib1g-dev libssl-dev
-$ gem install zold
+$ sudo apt-get install -y ruby-dev rubygems zlib1g-dev libssl-dev build-essential
+$ gem install --no-ri --no-rdoc zold
 ```
 
 ## OSX
@@ -35,7 +35,7 @@ $ brew install rbenv ruby-build
 $ rbenv install 2.5.1
 $ rbenv global 2.5.1
 $ ruby -v
-$ gem install zold
+$ gem install --no-ri --no-rdoc zold
 ```
 
 Without homebrew:

data/lib/zold/commands/diff.rb

@@ -63,12 +63,16 @@ Available options:"
     private
 
     def diff(wallet, cps, _)
-      raise 'There are no remote copies, try FETCH first' if cps.all.empty?
+      raise "There are no remote copies, try 'zold fetch' first" if cps.all.empty?
       cps = cps.all.sort_by { |c| c[:score] }.reverse
       patch = Patch.new
-      patch.start(Wallet.new(cps[0][:path]))
-      cps[1..-1].each do |c|
-        patch.join(Wallet.new(c[:path]))
+      cps.each do |c|
+        begin
+          patch.join(Wallet.new(c[:path]))
+        rescue StandardError => e
+          @log.error("Can't use a copy of #{wallet.id} from #{c[:host]}:#{c[:port]}; #{e.class.name}: #{e.message}")
+          @log.debug(e.backtrace.join("\n\t"))
+        end
       end
       before = AtomicFile.new(wallet.path).read
       after = ''

data/lib/zold/commands/merge.rb

@@ -65,22 +65,18 @@ Available options:"
         @log.error("There are no remote copies of #{id}, try 'zold fetch' first")
         return
       end
-      wallet = @wallets.find(id)
       cps = cps.all.sort_by { |c| c[:score] }.reverse
       patch = Patch.new
-      main = Wallet.new(cps[0][:path])
-      patch.start(main)
-      cps[1..-1].each do |c|
-        extra = Wallet.new(c[:path])
-        if extra.network != main.network
-          @log.error("The wallet is from a different network '#{extra.network}', ours is '#{main.network}'")
-          next
-        end
-        if extra.key != main.key
-          @log.error('Public key mismatch')
-          next
-        end
-        patch.join(extra)
+      cps.each do |c|
+        merge_one(patch, Wallet.new(c[:path]), "#{c[:host]}:#{c[:port]}")
+        @log.debug("#{c[:host]}:#{c[:port]} merged: #{patch}")
+      end
+      wallet = @wallets.find(id)
+      if wallet.exists?
+        merge_one(patch, wallet, 'localhost')
+        @log.debug("Local copy merged: #{patch}")
+      else
+        @log.debug("Local copy is absent, won't merge")
       end
       modified = patch.save(wallet.path, overwrite: true)
       if modified
@@ -90,5 +86,12 @@ Available options:"
       end
       modified
     end
+
+    def merge_one(patch, wallet, name)
+      patch.join(wallet)
+    rescue StandardError => e
+      @log.error("Can't merge a copy coming from #{name}; #{e.class.name}: #{e.message}")
+      @log.debug(e.backtrace.join("\n\t"))
+    end
   end
 end

data/lib/zold/copies.rb

@@ -94,6 +94,8 @@ module Zold
       load.group_by { |s| s[:name] }.map do |name, scores|
         {
           name: name,
+          host: scores[0][:host],
+          port: scores[0][:port],
           path: File.join(@dir, name),
           score: scores.select { |s| s[:time] > Time.now - 24 * 60 * 60 }
             .map { |s| s[:score] }

data/lib/zold/node/farm.rb

@@ -77,7 +77,7 @@ module Zold
               end
               s = @scores.pop
               next unless s.valid?
-              next if s.expired?
+              next if s.expired?(20)
               next if s.strength < strength
               @semaphore.synchronize do
                 save(s)

data/lib/zold/node/front.rb

@@ -149,7 +149,7 @@ module Zold
       wallet = settings.wallets.find(id)
       request.body.rewind
       after = request.body.read.to_s
-      before = wallet.exists? ? AtomicFile.new(wallet.path).read : ''
+      before = wallet.exists? ? AtomicFile.new(wallet.path).read.to_s : ''
       if before == after
         status 304
         return

data/lib/zold/patch.rb

@@ -30,14 +30,23 @@ require_relative 'atomic_file'
 module Zold
   # A patch
   class Patch
-    def start(wallet)
-      @id = wallet.id
-      @key = wallet.key
-      @txns = wallet.txns
-      @network = wallet.network
+    def to_s
+      return 'empty' if @id.nil?
+      "#{@txns.count} txns"
     end
 
     def join(wallet)
+      if @id.nil?
+        @id = wallet.id
+        @key = wallet.key
+        @txns = wallet.txns
+        @network = wallet.network
+      end
+      if wallet.network != @network
+        raise "The wallet is from a different network '#{wallet.network}', ours is '#{@network}'"
+      end
+      raise 'Public key mismatch' if wallet.key != @key
+      raise "Wallet ID mismatch: #{@id} != #{wallet.id}" if wallet.id != @id
       negative = @txns.select { |t| t.amount.negative? }
       max = negative.empty? ? 0 : negative.max_by(&:id).id
       wallet.txns.each do |txn|
@@ -47,13 +56,16 @@ module Zold
           (txn.id <= max ||
           @txns.find { |t| t.id == txn.id } ||
           @txns.map(&:amount).inject(&:+) < txn.amount)
-        next unless Signature.new.valid?(@key, wallet.id, txn)
+        unless Signature.new.valid?(@key, wallet.id, txn)
+          raise "Invalid RSA signature at transaction ##{txn.id} of #{wallet.id}"
+        end
         @txns << txn
       end
     end
 
     # Returns TRUE if the file was actually modified
     def save(file, overwrite: false)
+      raise 'You have to join at least one wallet in' if @id.nil?
       before = ''
       before = AtomicFile.new(file).read if File.exist?(file)
       wallet = Wallet.new(file)

data/lib/zold/score.rb

@@ -167,8 +167,8 @@ module Zold
       (Time.now - @time) / 60
     end
 
-    def expired?
-      @time < Time.now - 24 * 60 * 60
+    def expired?(hours = 24)
+      @time < Time.now - hours * 60 * 60
     end
 
     def prefix

data/lib/zold/version.rb

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

data/lib/zold/wallet.rb

@@ -160,8 +160,10 @@ module Zold
     end
 
     def lines
-      raise "File '#{@file}' is absent" unless File.exist?(@file)
-      AtomicFile.new(@file).read.split(/\n/)
+      raise "Wallet file '#{@file}' is absent" unless File.exist?(@file)
+      lines = AtomicFile.new(@file).read.split(/\n/)
+      raise "Not enough lines in #{@file}, just #{lines.count}" if lines.count < 4
+      lines
     end
   end
 end

data/test/commands/test_merge.rb

@@ -79,4 +79,31 @@ class TestMerge < Minitest::Test
       assert(wallet.id, modified[0])
     end
   end
+
+  def test_merges_with_a_broken_copy
+    FakeHome.new.run do |home|
+      wallet = home.create_wallet
+      copies = home.copies(wallet)
+      copies.add(File.read(wallet.path), 'good-host', 80, 5)
+      copies.add('some garbage', 'bad-host', 80, 5)
+      modified = Zold::Merge.new(wallets: home.wallets, copies: copies.root, log: test_log).run(
+        ['merge', wallet.id.to_s]
+      )
+      assert(modified.empty?)
+    end
+  end
+
+  def test_merges_a_copy_on_top
+    FakeHome.new.run do |home|
+      wallet = home.create_wallet
+      copies = home.copies(wallet)
+      copies.add(File.read(wallet.path), 'good-host', 80, 5)
+      key = Zold::Key.new(file: 'fixtures/id_rsa')
+      wallet.sub(Zold::Amount.new(zld: 9.99), "NOPREFIX@#{Zold::Id.new}", key)
+      Zold::Merge.new(wallets: home.wallets, copies: copies.root, log: test_log).run(
+        ['merge', wallet.id.to_s]
+      )
+      assert(!wallet.balance.zero?)
+    end
+  end
 end

data/test/test_patch.rb

@@ -46,9 +46,13 @@ class TestPatch < Minitest::Test
       t = third.sub(Zold::Amount.new(zld: 10.0), "NOPREFIX@#{Zold::Id.new}", key)
       third.add(t.inverse(first.id))
       patch = Zold::Patch.new
-      patch.start(first)
-      patch.join(second)
-      patch.join(third)
+      begin
+        patch.join(first)
+        patch.join(second)
+        patch.join(third)
+      rescue StandardError => e
+        test_log.info("Ignore it: #{e.message}")
+      end
       FileUtils.rm(first.path)
       assert_equal(true, patch.save(first.path))
       assert_equal(Zold::Amount.new(zld: -53.0), first.balance)

metadata

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