zold 0.14.28 → 0.14.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e31d92a96dac32c4a2c347ea562e35176e481a4c
-  data.tar.gz: '0695b4884ed252ffc7d0e0bb5baf322bb9f16755'
+  metadata.gz: 9b4acd567c5e890ca57ca7503ef5620cb7011c92
+  data.tar.gz: '08020f9c49dcd23340fe4f614190d3d24be30201'
 SHA512:
-  metadata.gz: 978a5f61ef0c5db91e7611b8d56f063b4f506387ce302d04361c49fd2f989158ccbc1bccf6379ddceb2eb16fe215cbbba0717fa57315c88e018890b347565f4b
-  data.tar.gz: a1a6d275a59aaf7ce4f1eb4b436738bd0832dcaaa83e1ed9f843d35dee2c878639b8752230aa9e8a394a21ac94d2107e4427ab4595e6e693f37c955e7bc93d99
+  metadata.gz: b31303f911f6a4f90b9e5a646e719f0df55163e3f3a4923a7b4953fc9f89fe436d6ed0f846a3115e1852e3308ffe4751a86da717ea0c7aaec13ea3ddf99d16e2
+  data.tar.gz: a33a1e676dfa1557baafb3f886c38de513ba7c98481d806313a96b5780c723bea580321768e3d1efc502138142ac785394effdaedc56de6e9b7948eed9007254

data/.rubocop.yml

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

data/appveyor.yml

@@ -9,12 +9,12 @@ branches:
 os: Windows Server 2012
 environment:
   matrix:
-    - RUBY_VERSION: 23
-    - RUBY_VERSION: 24
-    - RUBY_VERSION: 25
+    - ruby_version: "23-x64"
+    - ruby_version: "24-x64"
+    - ruby_version: "25-x64"
 install:
   - ps: |
-      $Env:PATH = "C:\Ruby${Env:ruby_version}-X64\bin;${Env:PATH}"
+      $Env:PATH = "C:\Ruby${Env:ruby_version}\bin;${Env:PATH}"
       if ($Env:ruby_version -match "^23" ) {
         # RubyInstaller; download OpenSSL headers from OpenKnapsack Project
         $Env:openssl_dir = "C:\Ruby${Env:ruby_version}"
@@ -25,13 +25,14 @@ install:
         # RubyInstaller2; openssl package seems to be installed already
         $Env:openssl_dir = "C:\msys64\mingw64"
       }
-  - cmd: ruby --version
-  - cmd: git --version
-  - cmd: bundle config --local path vendor/bundle
+  - bundle config --local path vendor/bundle
+  - bundle config build.openssl --with-openssl-dir=%openssl_dir%
+  - ruby -v
+  - bundle -v
 build_script:
   - bundle update
   - bundle install
 test_script:
-  - rake
+  - bundle exec rake --quiet
 cache:
   - vendor/bundle

data/bin/zold

@@ -35,6 +35,7 @@ require_relative '../lib/zold'
 require_relative '../lib/zold/version'
 require_relative '../lib/zold/wallet'
 require_relative '../lib/zold/wallets'
+require_relative '../lib/zold/sync_wallets'
 require_relative '../lib/zold/log'
 require_relative '../lib/zold/key'
 require_relative '../lib/zold/amount'
@@ -43,6 +44,7 @@ require_relative '../lib/zold/remotes'
 require_relative '../lib/zold/upgrades'
 require_relative '../lib/zold/version_file'
 
+Thread.current.name = 'main'
 
 Encoding.default_external = Encoding::UTF_8
 Encoding.default_internal = Encoding::UTF_8
@@ -138,7 +140,9 @@ Available options:"
   FileUtils.mkdir_p(opts[:home])
   Dir.chdir(opts[:home])
 
-  Zold::Upgrades.new(Zold::VersionFile.new('.zoldata/version'), 'upgrades').run
+  zoldata = File.expand_path(File.join(Dir.pwd, '.zoldata'))
+
+  Zold::Upgrades.new(Zold::VersionFile.new(File.join(zoldata, 'version')), 'upgrades').run
 
   # @todo #384:30min This is a workaround, move this code into Upgrades, somehow.
   #  We should find a way to run these arbitrary scripts and pass arguments
@@ -150,9 +154,9 @@ Available options:"
   require_relative '../upgrades/rename_foreign_wallets'
   Zold::RenameForeignWallets.new(Dir.pwd, opts['network'], log).exec
 
-  wallets = Zold::Wallets.new('.')
-  remotes = Zold::Remotes.new(file: './.zoldata/remotes', network: opts['network'])
-  copies = './.zoldata/copies'
+  wallets = Zold::SyncWallets.new(Zold::Wallets.new('.'), File.join(zoldata, 'locks'), log: log)
+  remotes = Zold::Remotes.new(file: File.join(zoldata, 'remotes'), network: opts['network'])
+  copies = File.join(zoldata, 'copies')
 
   case command
   when 'node'

data/fixtures/scripts/distribute-wallet.sh

@@ -73,15 +73,16 @@ if [ ! $(echo ${json} | jq -r '.wallets') == "1" ]; then
 fi
 
 # Now, we remove the wallet from the second node and expect the first
-# one to "spread" it again, almost immediately.
-rm ${second}/0000000000000000.z
+# one to "spread" it again, almost immediately. The second node should
+# have the wallet very soon.
+rm -f ${second}/0000000000000000.z
 i=0
 until zold fetch 0000000000000000 --ignore-score-weakness; do
   echo 'Failed to fetch, let us try again'
   ((i++)) || sleep 0
   if ((i==5)); then
+    echo "The wallet 0000000000000000 has not been spread, after ${i} attempts, here is the log:"
     cat ${first}/log.txt
-    echo "The wallet 0000000000000000 has not been spread, after ${i} attempts"
     exit 8
   fi
   sleep 5

data/lib/zold/commands/create.rb

@@ -60,12 +60,13 @@ Available options:"
     private
 
     def create(id, opts)
-      wallet = @wallets.find(id)
       key = Zold::Key.new(file: opts['public-key'])
-      wallet.init(id, key, network: opts['network'])
-      @log.info(wallet.id)
-      @log.debug("Wallet #{Rainbow(wallet).green} created at #{@wallets.path}")
-      wallet
+      @wallets.find(id) do |wallet|
+        wallet.init(id, key, network: opts['network'])
+        @log.debug("Wallet #{Rainbow(wallet).green} created at #{@wallets.path}")
+      end
+      @log.info(id)
+      id
     end
   end
 end

data/lib/zold/commands/diff.rb

@@ -53,25 +53,23 @@ Available options:"
       raise 'At least one wallet ID is required' if mine.empty?
       stdout = ''
       mine.map { |i| Id.new(i) }.each do |id|
-        stdout += diff(
-          @wallets.find(id),
-          Copies.new(File.join(@copies, id)),
-          opts
-        )
+        stdout += diff(id, Copies.new(File.join(@copies, id)), opts)
       end
       stdout
     end
 
     private
 
-    def diff(wallet, cps, _)
+    def diff(id, cps, _)
       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(@wallets, log: @log)
       cps.each do |c|
         patch.join(Wallet.new(c[:path]))
       end
-      before = AtomicFile.new(wallet.path).read
+      before = @wallets.find(id) do |wallet|
+        AtomicFile.new(wallet.path).read
+      end
       after = ''
       Tempfile.open(['', Wallet::EXTENSION]) do |f|
         patch.save(f.path, overwrite: true)

data/lib/zold/commands/fetch.rb

@@ -77,6 +77,7 @@ Available options:"
     private
 
     def fetch(id, cps, opts)
+      start = Time.now
       total = Concurrent::AtomicFixnum.new
       nodes = Concurrent::AtomicFixnum.new
       done = Concurrent::AtomicFixnum.new
@@ -87,7 +88,7 @@ Available options:"
       end
       raise "There are no remote nodes, run 'zold remote reset'" if nodes.value.zero?
       raise "No nodes out of #{nodes.value} have the wallet #{id}" if done.value.zero? && !opts['quiet-if-absent']
-      @log.info("#{done.value} copies of #{id} fetched with the total score of \
+      @log.info("#{done.value} copies of #{id} fetched in #{(Time.now - start).round}s with the total score of \
 #{total.value} from #{nodes.value} nodes")
       @log.debug("#{cps.all.count} local copies:")
       cps.all.each do |c|
@@ -127,7 +128,7 @@ Available options:"
         end
         copy = cps.add(File.read(f), score.host, score.port, score.value)
         @log.info("#{r} returned #{body.length}b/#{wallet.balance}/#{wallet.txns.count}t/\
-#{digest(json)}/#{Age.new(json['mtime'])} \
+#{digest(json)}/#{Age.new(json['mtime'])}/#{json['copies']}c \
 as copy #{copy} of #{id} in #{(Time.now - start).round(2)}s: #{Rainbow(score.value).green} (#{json['version']})")
       end
       score.value

data/lib/zold/commands/invoice.rb

@@ -51,9 +51,10 @@ Available options:"
       mine = Args.new(opts, @log).take || return
       raise 'Receiver wallet ID is required' if mine[0].nil?
       id = Zold::Id.new(mine[0])
-      wallet = @wallets.find(id)
-      raise "Wallet #{id} doesn\'t exist in #{@wallets}, do 'zold pull' first" unless wallet.exists?
-      invoice(wallet, opts)
+      @wallets.find(id) do |wallet|
+        raise "Wallet #{id} doesn\'t exist in #{@wallets}, do 'zold pull' first" unless wallet.exists?
+        invoice(wallet, opts)
+      end
     end
 
     private

data/lib/zold/commands/merge.rb

@@ -75,21 +75,22 @@ Available options:"
         merge_one(opts, patch, wallet, "#{c[:name]}/#{idx}/#{c[:score]}")
         score += c[:score]
       end
-      wallet = @wallets.find(id)
-      if wallet.exists?
-        merge_one(opts, patch, wallet, 'localhost')
-        @log.debug("Local copy of #{id} merged: #{patch}")
-      else
-        @log.debug("Local copy of #{id} is absent, nothing to merge")
-      end
-      modified = patch.save(wallet.path, overwrite: true)
-      if modified
-        @log.info("#{cps.count} copies with the total score of #{score} successfully merged \
+      @wallets.find(id) do |wallet|
+        if wallet.exists?
+          merge_one(opts, patch, wallet, 'localhost')
+          @log.debug("Local copy of #{id} merged: #{patch}")
+        else
+          @log.debug("Local copy of #{id} is absent, nothing to merge")
+        end
+        modified = patch.save(wallet.path, overwrite: true)
+        if modified
+          @log.info("#{cps.count} copies with the total score of #{score} successfully merged \
 into #{wallet.id}/#{wallet.balance}/#{wallet.txns.count}t")
-      else
-        @log.info("Nothing changed in #{wallet.id} after merge of #{cps.count} copies")
+        else
+          @log.info("Nothing changed in #{wallet.id} after merge of #{cps.count} copies")
+        end
+        modified
       end
-      modified
     end
 
     def merge_one(opts, patch, wallet, name)

data/lib/zold/commands/node.rb

@@ -28,19 +28,21 @@ require_relative '../backtrace'
 require_relative '../metronome'
 require_relative '../wallet'
 require_relative '../wallets'
-require_relative '../hungry_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/sync_entrance'
 require_relative '../node/nodup_entrance'
 require_relative '../node/front'
+require_relative '../node/trace'
 require_relative '../node/farm'
 require_relative 'pull'
 require_relative 'push'
 require_relative 'pay'
+require_relative 'remote'
 
 # NODE command.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -50,10 +52,10 @@ module Zold
   # NODE command
   class Node
     def initialize(wallets:, remotes:, copies:, log: Log::Quiet.new)
-      @wallets = HungryWallets.new(wallets)
       @remotes = remotes
       @copies = copies
       @log = log
+      @wallets = wallets
     end
 
     def run(args = [])
@@ -97,6 +99,9 @@ module Zold
         o.string '--halt-code',
           'The value of HTTP query parameter "halt," which will cause the front-end immediate termination',
           default: ''
+        o.integer '--trace-length',
+          'Maximum length of the trace to keep in memory (default: 4096)',
+          default: 4096
         o.string '--save-pid',
           'The file to save process ID into right after start (only in NOHUP mode)'
         o.bool '--never-reboot',
@@ -140,7 +145,9 @@ module Zold
         @log.info(pid)
         return
       end
-      Front.set(:log, @log)
+      trace = Trace.new(@log, opts['trace-length'])
+      Front.set(:log, trace)
+      Front.set(:trace, trace)
       Front.set(:version, opts['expose-version'])
       Front.set(:protocol, Zold::PROTOCOL)
       Front.set(:logging, @log.debug?)
@@ -152,9 +159,13 @@ module Zold
       @log.info("Zold protocol version: #{Zold::PROTOCOL}")
       @log.info("Network ID: #{opts['network']}")
       host = opts[:host] || ip
-      address = "#{host}:#{opts[:port]}".downcase
+      port = opts[:port]
+      address = "#{host}:#{port}".downcase
       @log.info("Node location: #{address}")
       @log.info("Local address: http://localhost:#{opts['bind-port']}/")
+      @log.info("Remote nodes (#{@remotes.all.count}): \
+#{@remotes.all.map { |r| "#{r[:host]}:#{r[:port]}" }.join(', ')}")
+      @log.info("Wallets at: #{@wallets.path}")
       Front.set(
         :server_settings,
         Logger: WebrickLog.new(@log),
@@ -163,6 +174,9 @@ module Zold
       if opts['standalone']
         @remotes = Zold::Remotes::Empty.new(file: '/tmp/standalone')
         @log.debug('Running in standalone mode! (will never talk to other remotes)')
+      else
+        Zold::Remote.new(remotes: @remotes).run(['remote', 'remove', host, port.to_s, '--force'])
+        @log.info("Removed current node (#{address}) from list of remotes")
       end
       Front.set(:ignore_score_weakness, opts['ignore-score-weakness'])
       Front.set(:network, opts['network'])
@@ -175,21 +189,22 @@ module Zold
       Front.set(:port, opts['bind-port'])
       Front.set(:reboot, !opts['never-reboot'])
       node_alias = opts[:alias] || address
-      unless node_alias.eql?(address)
-        re = Regexp.new(/^[a-z0-9]{4,16}$/)
-        raise '--alias should be a 4 to 16 char long alphanumeric string' unless re.match(node_alias)
+      unless node_alias.eql?(address) || node_alias =~ /^[a-z0-9]{4,16}$/
+        raise "Alias should be a 4 to 16 char long alphanumeric string: #{node_alias}"
       end
       Front.set(:node_alias, node_alias)
       invoice = opts[:invoice]
       unless invoice.include?('@')
-        if @wallets.find(Id.new(invoice)).exists?
-          @log.info("Wallet #{invoice} already exists locally, won't pull")
-        else
-          @log.info("The wallet #{invoice} is not available locally, will pull now...")
-          require_relative 'pull'
-          Pull.new(wallets: @wallets, remotes: @remotes, copies: @copies, log: @log).run(
-            ['pull', invoice, "--network=#{opts['network']}"]
-          )
+        @wallets.find(Id.new(invoice)) do |wallet|
+          if wallet.exists?
+            @log.info("Wallet #{invoice} already exists locally, won't pull")
+          else
+            @log.info("The wallet #{invoice} is not available locally, will pull now...")
+            require_relative 'pull'
+            Pull.new(wallets: @wallets, remotes: @remotes, copies: @copies, log: @log).run(
+              ['pull', invoice, "--network=#{opts['network']}"]
+            )
+          end
         end
         require_relative 'invoice'
         invoice = Invoice.new(wallets: @wallets, log: @log).run(['invoice', invoice])
@@ -198,7 +213,15 @@ module Zold
         NoDupEntrance.new(
           AsyncEntrance.new(
             SpreadEntrance.new(
-              Entrance.new(@wallets, @remotes, @copies, address, log: @log, network: opts['network']),
+              SyncEntrance.new(
+                Entrance.new(
+                  @wallets,
+                  @remotes, @copies, address,
+                  log: @log, network: opts['network']
+                ),
+                File.join(Dir.pwd, '.zoldata/entrance'),
+                log: @log
+              ),
               @wallets, @remotes, address,
               log: @log,
               ignore_score_weakeness: opts['ignore-score-weakness']
@@ -293,7 +316,7 @@ module Zold
       metronome.add(Routines::Spread.new(opts, @wallets, @remotes, log: @log))
       unless opts['standalone']
         require_relative 'routines/reconnect'
-        metronome.add(Routines::Reconnect.new(opts, @remotes, farm, network: opts['network'], log: Log::Quiet.new))
+        metronome.add(Routines::Reconnect.new(opts, @remotes, farm, network: opts['network'], log: @log))
       end
       @log.info('Metronome created')
       metronome

data/lib/zold/commands/pay.rb

@@ -67,8 +67,6 @@ Available options:"
       mine = Args.new(opts, @log).take || return
       raise 'Payer wallet ID is required as the first argument' if mine[0].nil?
       id = Id.new(mine[0])
-      from = @wallets.find(id)
-      raise "Wallet #{id} doesn't exist, do 'zold pull' first" unless from.exists?
       raise 'Recepient\'s invoice or wallet ID is required as the second argument' if mine[1].nil?
       invoice = mine[1]
       unless invoice.include?('@')
@@ -78,20 +76,29 @@ Available options:"
       raise 'Amount is required (in ZLD) as the third argument' if mine[2].nil?
       amount = Amount.new(zld: mine[2].to_f)
       details = mine[3] || '-'
-      if Tax.new(from).in_debt? && !opts['dont-pay-taxes']
-        require_relative 'taxes'
-        Taxes.new(wallets: @wallets, remotes: @remotes, log: @log).run(
-          ['taxes', 'pay', "--private-key=#{opts['private-key']}", id.to_s]
-        )
+      taxes(id)
+      @wallets.find(id) do |from|
+        pay(from, invoice, amount, details, opts)
       end
-      pay(from, invoice, amount, details, opts)
       return if opts['skip-propagate']
       require_relative 'propagate'
-      Propagate.new(wallets: @wallets, log: @log).run(['propagate', from.id.to_s])
+      Propagate.new(wallets: @wallets, log: @log).run(['propagate', id.to_s])
     end
 
     private
 
+    def taxes(id)
+      debt = @wallets.find(id) do |wallet|
+        raise "Wallet #{id} doesn't exist, do 'zold pull' first" unless wallet.exists?
+        Tax.new(wallet).in_debt? && !opts['dont-pay-taxes']
+      end
+      return unless debt
+      require_relative 'taxes'
+      Taxes.new(wallets: @wallets, remotes: @remotes, log: @log).run(
+        ['taxes', 'pay', "--private-key=#{opts['private-key']}", id.to_s]
+      )
+    end
+
     def pay(from, invoice, amount, details, opts)
       unless opts.force?
         raise 'The amount can\'t be zero' if amount.zero?

data/lib/zold/commands/propagate.rb

@@ -51,7 +51,7 @@ Available options:"
       mine = @wallets.all if mine.empty?
       modified = []
       mine.map { |i| Id.new(i) }.each do |id|
-        modified += propagate(@wallets.find(id), opts)
+        modified += propagate(id, opts)
       end
       modified
     end
@@ -59,30 +59,33 @@ Available options:"
     private
 
     # Returns list of Wallet IDs which were affected
-    def propagate(wallet, _)
-      me = wallet.id
+    def propagate(id, _)
       modified = []
-      wallet.txns.select { |t| t.amount.negative? }.each do |t|
-        target = @wallets.find(t.bnf)
-        unless target.exists?
-          @log.debug("#{t.amount * -1} to #{t.bnf}: wallet is absent")
-          next
+      @wallets.find(id) do |wallet|
+        wallet.txns.select { |t| t.amount.negative? }.each do |t|
+          next if t.bnf == id
+          @wallets.find(t.bnf) do |target|
+            unless target.exists?
+              @log.debug("#{t.amount * -1} to #{t.bnf}: wallet is absent")
+              next
+            end
+            unless target.network == wallet.network
+              @log.error("#{t.amount * -1} to #{t.bnf}: network mismatch, '#{target.network}'!='#{wallet.network}'")
+              next
+            end
+            next if target.has?(t.id, id)
+            unless target.prefix?(t.prefix)
+              @log.error("#{t.amount * -1} to #{t.bnf}: wrong prefix")
+              next
+            end
+            target.add(t.inverse(id))
+            @log.info("#{t.amount * -1} arrived to #{t.bnf}: #{t.details}")
+            modified << t.bnf
+          end
         end
-        unless target.network == wallet.network
-          @log.error("#{t.amount * -1} to #{t.bnf}: network mismatch, '#{target.network}'!='#{wallet.network}'")
-          next
-        end
-        next if target.has?(t.id, me)
-        unless target.prefix?(t.prefix)
-          @log.error("#{t.amount * -1} to #{t.bnf}: wrong prefix")
-          next
-        end
-        target.add(t.inverse(me))
-        @log.info("#{t.amount * -1} arrived to #{t.bnf}: #{t.details}")
-        modified << t.bnf
       end
       modified.uniq!
-      @log.debug("Wallet #{me} propagated successfully, #{modified.count} wallets affected")
+      @log.debug("Wallet #{id} propagated successfully, #{modified.count} wallets affected")
       modified
     end
   end