zold 0.14.28 → 0.14.29

data/lib/zold/node/nodup_entrance.rb

@@ -59,8 +59,9 @@ module Zold
         wallet = Wallet.new(f.path)
         wallet.refurbish
         after = File.read(wallet.path)
-        wallet = @wallets.find(id)
-        before = wallet.exists? ? AtomicFile.new(wallet.path).read.to_s : ''
+        before = @wallets.find(id) do |w|
+          w.exists? ? AtomicFile.new(w.path).read.to_s : ''
+        end
         if before == after
           @log.info("Duplicate of #{id}/#{wallet.digest[0, 6]}/#{after.length}b/#{wallet.txns.count}t ignored")
           return []

data/lib/zold/node/sync_entrance.rb

@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2018 Yegor Bugayenko
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the 'Software'), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require 'concurrent'
+require_relative '../log'
+require_relative '../id'
+require_relative '../verbose_thread'
+
+# The sync entrance of the web front.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2018 Yegor Bugayenko
+# License:: MIT
+module Zold
+  # The entrance that makes sure only one thread works with a wallet
+  class SyncEntrance
+    def initialize(entrance, dir, timeout: 30, log: Log::Quiet.new)
+      raise 'Entrance can\'t be nil' if entrance.nil?
+      @entrance = entrance
+      raise 'Dir can\'t be nil' if dir.nil?
+      @dir = dir
+      @timeout = timeout
+      raise 'Log can\'t be nil' if log.nil?
+      @log = log
+    end
+
+    def to_json
+      @entrance.to_json
+    end
+
+    def start
+      @entrance.start do
+        yield(self)
+      end
+    end
+
+    # Always returns an array with a single ID of the pushed wallet
+    def push(id, body)
+      f = File.join(@dir, "#{id}.lock")
+      FileUtils.mkdir_p(File.dirname(f))
+      File.open(f, File::RDWR | File::CREAT) do |lock|
+        start = Time.now
+        cycles = 0
+        loop do
+          break if lock.flock(File::LOCK_EX | File::LOCK_NB)
+          sleep 0.1
+          cycles += 1
+          delay = Time.now - start
+          if delay > @timeout
+            raise "##{Process.pid}/#{Thread.current.name} can't get exclusive access to the wallet #{id}/e \
+because of the lock at #{lock.path}: #{File.read(lock)}"
+          end
+          if (cycles % 20).zero?
+            @log.info("##{Process.pid}/#{Thread.current.name} still waiting for \
+exclusive access to #{id}/e, #{delay.round}s already")
+          end
+        end
+        File.write(lock, "##{Process.pid}/#{Thread.current.name}/#{Time.now.utc.iso8601}")
+        @entrance.push(id, body)
+      end
+    end
+  end
+end

data/lib/zold/node/trace.rb

@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2018 Yegor Bugayenko
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the 'Software'), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+# The web front of the node.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2018 Yegor Bugayenko
+# License:: MIT
+module Zold
+  # Log that traces everything
+  class Trace
+    def initialize(log, limit = 4096)
+      @log = log
+      @buffer = []
+      @mutex = Mutex.new
+      @limit = limit
+    end
+
+    def to_s
+      @mutex.synchronize do
+        @buffer.join("\n")
+      end
+    end
+
+    def debug(msg)
+      @log.debug(msg)
+      append('DBG', msg) if debug?
+    end
+
+    def debug?
+      @log.debug?
+    end
+
+    def info(msg)
+      @log.info(msg)
+      append('INF', msg) if info?
+    end
+
+    def info?
+      @log.info?
+    end
+
+    def error(msg)
+      @log.error(msg)
+      append('ERR', msg)
+    end
+
+    private
+
+    def append(level, msg)
+      @mutex.synchronize do
+        @buffer << "#{level}: #{msg}"
+        @buffer.shift if @buffer.size > @limit
+      end
+    end
+  end
+end

data/lib/zold/patch.rb

@@ -101,12 +101,11 @@ module Zold
             @log.error("Payment prefix '#{txn.prefix}' doesn't match with the key of #{wallet.id}: #{txn.to_text}")
             next
           end
-          payer = @wallets.find(txn.bnf)
-          unless payer.exists?
+          unless @wallets.find(txn.bnf, &:exists?)
             @log.error("Paying wallet file is absent: #{txn.to_text}")
             next
           end
-          unless payer.has?(txn.id, wallet.id)
+          unless @wallets.find(txn.bnf) { |p| p.has?(txn.id, wallet.id) }
             @log.error("Paying wallet #{txn.bnf} doesn't have transaction ##{txn.id} \
 among #{payer.txns.count} transactions: #{txn.to_text}")
             next

data/lib/zold/remotes.rb

@@ -178,7 +178,7 @@ module Zold
       list.each do |r|
         pool.post do
           Thread.current.abort_on_exception = true
-          Thread.current.name = 'remotes'
+          Thread.current.name = "remotes@#{r[:host]}:#{r[:port]}"
           start = Time.now
           begin
             yield Remotes::Remote.new(

data/lib/zold/sync_wallets.rb

@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2018 Yegor Bugayenko
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the 'Software'), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require_relative 'log'
+
+# Sync collection of wallets.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2018 Yegor Bugayenko
+# License:: MIT
+module Zold
+  # Synchronized collection of wallets
+  class SyncWallets
+    def initialize(wallets, dir, timeout: 30, log: Log::Quiet.new)
+      @wallets = wallets
+      @dir = dir
+      @log = log
+      @timeout = timeout
+    end
+
+    def to_s
+      @wallets.to_s
+    end
+
+    def path
+      @wallets.path
+    end
+
+    def all
+      @wallets.all
+    end
+
+    def find(id)
+      @wallets.find(id) do |wallet|
+        f = File.join(@dir, id)
+        FileUtils.mkdir_p(File.dirname(f))
+        File.open(f, File::RDWR | File::CREAT) do |lock|
+          start = Time.now
+          cycles = 0
+          loop do
+            break if lock.flock(File::LOCK_EX | File::LOCK_NB)
+            sleep 0.1
+            cycles += 1
+            delay = Time.now - start
+            if delay > @timeout
+              raise "##{Process.pid}/#{Thread.current.name} can't get exclusive access to the wallet #{id} \
+because of the lock at #{lock.path}: #{File.read(lock)}"
+            end
+            if (cycles % 20).zero?
+              @log.info("##{Process.pid}/#{Thread.current.name} still waiting for \
+exclusive access to #{id}, #{delay.round}s already: #{File.read(lock)}")
+            end
+          end
+          File.write(lock, "##{Process.pid}/#{Thread.current.name}")
+          yield wallet
+        end
+      end
+    end
+  end
+end

data/lib/zold/version.rb

@@ -25,6 +25,6 @@
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 module Zold
-  VERSION = '0.14.28'
+  VERSION = '0.14.29'
   PROTOCOL = 2
 end

data/lib/zold/wallet.rb

@@ -126,6 +126,7 @@ module Zold
     def add(txn)
       raise 'The txn has to be of type Txn' unless txn.is_a?(Txn)
       dup = txns.find { |t| t.bnf == txn.bnf && t.id == txn.id }
+      raise "Wallet #{id} can't pay itself: #{txn}" if txn.bnf == id
       raise "The transaction with the same ID and BNF already exists: #{dup}" unless dup.nil?
       raise "The tax payment already exists: #{txn}" if Tax.new(self).exists?(txn)
       File.open(@file, 'a') { |f| f.print "#{txn}\n" }

data/lib/zold/wallets.rb

@@ -37,10 +37,10 @@ module Zold
     # @todo #70:30min Let's make it smarter. Instead of returning
     #  the full path let's substract the prefix from it if it's equal
     #  to the current directory in Dir.pwd.
-    def to_s(curr_dir = Dir.pwd)
-      curr_path = Pathname.new(path)
-      dir_path = Pathname.new(curr_dir)
-      curr_path.relative_path_from(dir_path).to_s
+    def to_s
+      mine = Pathname.new(File.expand_path(@dir))
+      home = Pathname.new(File.expand_path(Dir.pwd))
+      mine.relative_path_from(home).to_s
     end
 
     def path
@@ -63,7 +63,7 @@ module Zold
     def find(id)
       raise 'Id can\'t be nil' if id.nil?
       raise 'Id must be of type Id' unless id.is_a?(Id)
-      Zold::Wallet.new(File.join(path, id.to_s))
+      yield Zold::Wallet.new(File.join(path, id.to_s))
     end
   end
 end

data/test/commands/test_create.rb

@@ -34,14 +34,17 @@ require_relative '../../lib/zold/commands/create'
 class TestCreate < Minitest::Test
   def test_creates_wallet
     Dir.mktmpdir do |dir|
-      wallet = Zold::Create.new(wallets: Zold::Wallets.new(dir), log: test_log).run(
+      wallets = Zold::Wallets.new(dir)
+      id = Zold::Create.new(wallets: wallets, log: test_log).run(
         ['create', '--public-key=fixtures/id_rsa.pub']
       )
-      assert wallet.balance.zero?
-      assert(
-        File.exist?(File.join(dir, "#{wallet.id}#{Zold::Wallet::EXTENSION}")),
-        "Wallet file not found: #{wallet.id}#{Zold::Wallet::EXTENSION}"
-      )
+      wallets.find(id) do |wallet|
+        assert(wallet.balance.zero?)
+        assert(
+          File.exist?(File.join(dir, "#{wallet.id}#{Zold::Wallet::EXTENSION}")),
+          "Wallet file not found: #{wallet.id}#{Zold::Wallet::EXTENSION}"
+        )
+      end
     end
   end
 end

data/test/commands/test_diff.rb

@@ -47,7 +47,7 @@ class TestDiff < Minitest::Test
       second = home.create_wallet
       File.write(second.path, File.read(wallet.path))
       Zold::Pay.new(wallets: home.wallets, remotes: home.remotes, log: test_log).run(
-        ['pay', wallet.id.to_s, second.id.to_s, '14.95', '--force', '--private-key=fixtures/id_rsa']
+        ['pay', wallet.id.to_s, "NOPREFIX@#{Zold::Id.new}", '14.95', '--force', '--private-key=fixtures/id_rsa']
       )
       copies = home.copies(wallet)
       copies.add(File.read(first.path), 'host-1', 80, 5)

data/test/commands/test_invoice.rb

@@ -38,12 +38,13 @@ class TestInvoice < Minitest::Test
     Dir.mktmpdir do |dir|
       id = Zold::Id.new
       wallets = Zold::Wallets.new(dir)
-      source = wallets.find(id)
-      source.init(id, Zold::Key.new(file: 'fixtures/id_rsa.pub'))
-      invoice = Zold::Invoice.new(wallets: wallets, log: test_log).run(
-        ['invoice', id.to_s, '--length=16']
-      )
-      assert_equal(33, invoice.length)
+      wallets.find(id) do |source|
+        source.init(id, Zold::Key.new(file: 'fixtures/id_rsa.pub'))
+        invoice = Zold::Invoice.new(wallets: wallets, log: test_log).run(
+          ['invoice', id.to_s, '--length=16']
+        )
+        assert_equal(33, invoice.length)
+      end
     end
   end
 end

data/test/commands/test_list.rb

@@ -37,9 +37,10 @@ class TestList < Minitest::Test
     Dir.mktmpdir do |dir|
       id = Zold::Id.new
       wallets = Zold::Wallets.new(dir)
-      wallet = wallets.find(id)
-      wallet.init(Zold::Id.new, Zold::Key.new(file: 'fixtures/id_rsa.pub'))
-      Zold::List.new(wallets: wallets, log: test_log).run
+      wallets.find(id) do |wallet|
+        wallet.init(Zold::Id.new, Zold::Key.new(file: 'fixtures/id_rsa.pub'))
+        Zold::List.new(wallets: wallets, log: test_log).run
+      end
     end
   end
 end

data/test/commands/test_merge.rb

@@ -49,7 +49,7 @@ class TestMerge < Minitest::Test
       second = home.create_wallet
       File.write(second.path, File.read(wallet.path))
       Zold::Pay.new(wallets: home.wallets, remotes: home.remotes, log: test_log).run(
-        ['pay', wallet.id.to_s, second.id.to_s, '14.95', '--force', '--private-key=fixtures/id_rsa']
+        ['pay', wallet.id.to_s, "NOPREFIX@#{Zold::Id.new}", '14.95', '--force', '--private-key=fixtures/id_rsa']
       )
       copies = home.copies(wallet)
       copies.add(File.read(first.path), 'host-1', 80, 5)
@@ -70,7 +70,7 @@ class TestMerge < Minitest::Test
       second = home.create_wallet
       File.write(second.path, File.read(wallet.path))
       Zold::Pay.new(wallets: home.wallets, remotes: home.remotes, log: test_log).run(
-        ['pay', wallet.id.to_s, second.id.to_s, '14.95', '--force', '--private-key=fixtures/id_rsa']
+        ['pay', wallet.id.to_s, "NOPREFIX@#{Zold::Id.new}", '14.95', '--force', '--private-key=fixtures/id_rsa']
       )
       copies = home.copies(wallet)
       copies.add(File.read(first.path), 'host-1', 80, 5)

data/test/commands/test_pull.rb

@@ -43,7 +43,9 @@ class TestPull < Minitest::Test
       Zold::Pull.new(wallets: home.wallets, remotes: remotes, copies: home.copies.root.to_s, log: test_log).run(
         ['--ignore-this-stupid-option', 'pull', id.to_s]
       )
-      assert(home.wallets.find(Zold::Id.new(id)).exists?)
+      home.wallets.find(Zold::Id.new(id)) do |wallet|
+        assert(wallet.exists?)
+      end
     end
   end
 end

data/test/commands/test_remote.rb

@@ -97,6 +97,10 @@ class TestRemote < Minitest::Test
       score = Zold::Score.new(
         time: Time.now, host: 'aa1.example.org', port: 9999, invoice: 'NOPREFIX4@ffffffffffffffff'
       )
+      stub_request(:get, 'http://localhost:8883/version').to_return(
+        status: 200,
+        body: '0.0.0'
+      )
       stub_request(:get, "http://#{score.host}:#{score.port}/remotes").to_return(
         status: 200,
         body: {

data/test/commands/test_show.rb

@@ -38,10 +38,11 @@ class TestShow < Minitest::Test
     Dir.mktmpdir do |dir|
       id = Zold::Id.new
       wallets = Zold::Wallets.new(dir)
-      wallet = wallets.find(id)
-      wallet.init(Zold::Id.new, Zold::Key.new(file: 'fixtures/id_rsa.pub'))
-      balance = Zold::Show.new(wallets: wallets, log: test_log).run(['show', id.to_s])
-      assert_equal(Zold::Amount::ZERO, balance)
+      wallets.find(id) do |wallet|
+        wallet.init(Zold::Id.new, Zold::Key.new(file: 'fixtures/id_rsa.pub'))
+        balance = Zold::Show.new(wallets: wallets, log: test_log).run(['show', id.to_s])
+        assert_equal(Zold::Amount::ZERO, balance)
+      end
     end
   end
 end

data/test/fake_home.rb

@@ -24,6 +24,7 @@ require 'tmpdir'
 require_relative '../lib/zold/id'
 require_relative '../lib/zold/wallet'
 require_relative '../lib/zold/wallets'
+require_relative '../lib/zold/sync_wallets'
 require_relative '../lib/zold/key'
 require_relative '../lib/zold/version'
 require_relative '../lib/zold/remotes'
@@ -47,7 +48,7 @@ class FakeHome
   end
 
   def wallets
-    Zold::Wallets.new(@dir)
+    Zold::SyncWallets.new(Zold::Wallets.new(@dir), File.join(@dir, 'locks'))
   end
 
   def create_wallet(id = Zold::Id.new, dir = @dir)