zold 0.29.20 → 0.29.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a384987626036b4943acf7207bc6043b587d5de3c69468d1c17eb2f337cbae0
-  data.tar.gz: ad950bb71ec0e09858a0d10c6ba5baecc390648336cd766f12b79ae33388429c
+  metadata.gz: 1b0d7ac8dd66157373eb07294a099889a0bc0473f641f50d162179889e525fcb
+  data.tar.gz: 9cb56fc29fccb99b770ad25c9b1a4ffcaaf590c5534482d5e5b558cd73db7f8b
 SHA512:
-  metadata.gz: ca5b3e919cb7442d6944fe6d0b74f212cf8ac52a7762d8f1017fd812c5f535483cd5ca24fee592fa0a1d5b955bb801929b8da7698d7c2704487dec4d9ad99f85
-  data.tar.gz: d7b498c210aef31fe97b9216def70a89b7a0f39c5bc425ab2134f912fb8b56f3e3011446b1538cb89e85509a32ea85780616a4a2b88ebc5e1bb2dd71c86ce32b
+  metadata.gz: af0e8a298e25443b4d8583f3aff9c2df2da048d2d7842f7d3b5d665dbcee71131d1e42927c4d7b5f03a54097bc9d31fdbd05ccbe30eac08f92a223c1986dcc9e
+  data.tar.gz: 5067cdd096e87664e678cbe3bc9f152e1d835a6a9498d78b55d86ad59f004f9e051ed3218e007634fdd397d9c2318032d949c46e5940354c8107863e05be6be8

data/lib/zold/commands/fetch.rb

@@ -162,13 +162,13 @@ run 'zold remote update' or use --tolerate-quorum=1"
             wallet = Wallet.new(f.path)
             wallet.refurbish
             if wallet.protocol != Zold::PROTOCOL
-              raise "Protocol #{wallet.protocol} doesn't match #{Zold::PROTOCOL} in #{id}"
+              raise FetchError, "Protocol #{wallet.protocol} doesn't match #{Zold::PROTOCOL} in #{id}"
             end
             if wallet.network != opts['network']
-              raise "The wallet #{id} is in network '#{wallet.network}', while we are in '#{opts['network']}'"
+              raise FetchError, "The wallet #{id} is in '#{wallet.network}', while we are in '#{opts['network']}'"
             end
             if wallet.balance.negative? && !wallet.root?
-              raise "The balance of #{id} is #{wallet.balance} and it's not a root wallet"
+              raise FetchError, "The balance of #{id} is #{wallet.balance} and it's not a root wallet"
             end
             copy = cps.add(IO.read(f), score.host, score.port, score.value, master: r.master?)
             @log.debug("#{r} returned #{wallet.mnemo} #{Age.new(json['mtime'])}/#{json['copies']}c \

data/lib/zold/commands/merge.rb

@@ -159,8 +159,13 @@ into #{@wallets.acq(id, &:mnemo)} in #{Age.new(start, limit: 0.1 + cps.count * 0
       else
         patch.join(wallet, ledger: opts['ledger']) do |txn|
           trusted = IO.read(opts['trusted']).split(',')
-          IO.write(opts['trusted'], (trusted + [txn.bnf.to_s]).join(','))
-          unless trusted.include?(txn.bnf.to_s) || trusted.count > opts['trusted-max']
+          if trusted.include?(txn.bnf.to_s)
+            @log.debug("Won't PULL #{txn.bnf} since it is already trusted, among #{trusted.count} others")
+          elsif trusted.count > opts['trusted-max']
+            @log.debug("Won't PULL #{txn.bnf} since there are too many trusted wallets already: \
+#{trusted.count} > #{opts['trusted-max']}")
+          else
+            IO.write(opts['trusted'], (trusted + [txn.bnf.to_s]).sort.uniq.join(','))
             Pull.new(wallets: @wallets, remotes: @remotes, copies: @copies, log: @log).run(
               ['pull', txn.bnf.to_s, "--network=#{Shellwords.escape(opts['network'])}", '--quiet-if-absent'] +
               (opts['deep'] ? ['--deep'] : ['--shallow']) +

data/lib/zold/commands/pay.rb

@@ -141,7 +141,6 @@ the difference is #{(amount - from.balance).to_i} zents"
       end
       pem = IO.read(opts['private-key'])
       unless opts['keygap'].empty?
-        puts opts['keygap']
         pem = pem.sub('*' * opts['keygap'].length, opts['keygap'])
         @log.debug("Keygap \"#{'*' * opts['keygap'].length}\" injected into the RSA private key")
       end

data/lib/zold/copies.rb

@@ -57,7 +57,14 @@ module Zold
     def clean(max: 24 * 60 * 60)
       Futex.new(file, log: @log).open do
         list = load
-        list.reject! { |s| s[:time] < Time.now - max }
+        list.reject! do |s|
+          if s[:time] >= Time.now - max
+            false
+          else
+            @log.debug("Copy ##{s[:name]}/#{s[:host]}:#{s[:port]} is too old, over #{Age.new(s[:time])}")
+            true
+          end
+        end
         save(list)
         deleted = 0
         files.each do |f|
@@ -68,18 +75,21 @@ module Zold
           @log.debug("Copy at #{f} deleted: #{Size.new(size)}")
           deleted += 1
         end
-        files.each do |f|
-          cp = File.join(@dir, f)
+        list.select! do |s|
+          cp = File.join(@dir, "#{s[:name]}#{Copies::EXT}")
           wallet = Wallet.new(cp)
           begin
             wallet.refurbish
             raise "Invalid protocol #{wallet.protocol} in #{cp}" unless wallet.protocol == Zold::PROTOCOL
+            true
           rescue StandardError => e
             FileUtils.rm_rf(cp)
-            @log.debug("Copy at #{f} deleted: #{Backtrace.new(e)}")
+            @log.debug("Copy at #{cp} deleted: #{Backtrace.new(e)}")
             deleted += 1
+            false
           end
         end
+        save(list)
         deleted
       end
     end

data/lib/zold/node/front.rb

@@ -98,7 +98,10 @@ module Zold
       @start = Time.now
       if !settings.opts['halt-code'].empty? && params[:halt] && params[:halt] == settings.opts['halt-code']
         settings.log.info('Halt signal received, shutting the front end down...')
-        Front.stop!
+        Thread.start do
+          sleep 0.1
+          Front.stop!
+        end
       end
       check_header(Http::NETWORK_HEADER) do |header|
         if header != settings.opts['network']
@@ -471,7 +474,7 @@ this is not a normal behavior, you may want to report a bug to our GitHub reposi
           description: 'The journal',
           id: params[:id],
           files: DirItems.new(settings.journal_dir).fetch.sort.reverse.select do |f|
-            !params[:id] || f.start_with?(params[:id])
+            !params[:id] || f.include?(params[:id])
           end,
           dir: settings.journal_dir
         }

data/lib/zold/version.rb

@@ -25,7 +25,7 @@
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 module Zold
-  VERSION = '0.29.20'
+  VERSION = '0.29.21'
   PROTOCOL = 2
   REPO = 'zold-io/zold'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.29.20
+  version: 0.29.21
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -798,7 +798,7 @@ licenses:
 - MIT
 metadata: {}
 post_install_message: |-
-  Thanks for installing Zold 0.29.20!
+  Thanks for installing Zold 0.29.21!
     Study our White Paper: https://papers.zold.io/wp.pdf
     Read our blog posts: https://blog.zold.io
     Try ZLD online wallet at: https://wts.zold.io