zold 0.29.21 → 0.29.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b0d7ac8dd66157373eb07294a099889a0bc0473f641f50d162179889e525fcb
-  data.tar.gz: 9cb56fc29fccb99b770ad25c9b1a4ffcaaf590c5534482d5e5b558cd73db7f8b
+  metadata.gz: 5b4542141ab23f1369c77e16a27e14999b91d20fc7d9a44e15951cdae5cefa41
+  data.tar.gz: ff130bde3e777a600141445f1367cc3f0738d870887591f890e49b8171e14846
 SHA512:
-  metadata.gz: af0e8a298e25443b4d8583f3aff9c2df2da048d2d7842f7d3b5d665dbcee71131d1e42927c4d7b5f03a54097bc9d31fdbd05ccbe30eac08f92a223c1986dcc9e
-  data.tar.gz: 5067cdd096e87664e678cbe3bc9f152e1d835a6a9498d78b55d86ad59f004f9e051ed3218e007634fdd397d9c2318032d949c46e5940354c8107863e05be6be8
+  metadata.gz: 17f943b32fd7d8d2a9140cd4a2212573e2f90afd9a7b59a539d3550f5861f1c7fd0addf89f2eac16b493d78049bddc1e382b342d65b0375e2e6648750b17ceb4
+  data.tar.gz: 961b59b291f64b5d4369f5191a07809528198d47a502212b8461c7c87bd4f849e60f71e1944aa6279a5f5d3085f02ef9dead8324b979f569adce40bed2a132ab

data/lib/zold/commands/clean.rb

@@ -70,7 +70,7 @@ Available options:"
 
     def clean(cps, opts)
       start = Time.now
-      deleted = cps.clean(max: opts['max-age'])
+      deleted = cps.clean(max: opts['max-age'] * 60 * 60)
       list = cps.all.map do |c|
         wallet = Wallet.new(c[:path])
         "#{c[:name]}: #{c[:score]} #{wallet.mnemo} \

data/lib/zold/node/journaled_pipeline.rb

@@ -22,6 +22,7 @@
 
 require 'tempfile'
 require 'diffy'
+require 'fileutils'
 require_relative 'pipeline'
 require_relative '../log'
 require_relative '../age'
@@ -88,6 +89,7 @@ module Zold
       jlog.info("Zold gem version: #{Zold::VERSION}")
       modified = @pipeline.push(id, body, JournaledPipeline::Wallets.new(wallets, jlog), Log::Tee.new(log, jlog))
       jlog.info("push(#{id}): done")
+      FileUtils.mv(journal, journal + '-done')
       modified
     end
   end

data/lib/zold/node/pipeline.rb

@@ -89,7 +89,7 @@ module Zold
         modified = Tempfile.open do |t|
           Merge.new(wallets: wallets, remotes: @remotes, copies: copies.root, log: log).run(
             ['merge', id.to_s, "--ledger=#{Shellwords.escape(f.path)}"] +
-            ["--trusted=#{Shellwords.escape(t.path)}", '--deep'] +
+            ["--trusted=#{Shellwords.escape(t.path)}", '--deep', '--trusted-max=256'] +
             ["--network=#{Shellwords.escape(@network)}"]
           )
         end

data/lib/zold/patch.rb

@@ -85,6 +85,7 @@ module Zold
       end
       seen = 0
       added = 0
+      pulled = []
       wallet.txns.each do |txn|
         next if @txns.find { |t| t == txn }
         seen += 1
@@ -114,12 +115,20 @@ with a new one \"#{txn.to_text}\" from #{wallet.mnemo}")
             next
           end
           unless @wallets.acq(txn.bnf, &:exists?)
+            next if pulled.include?(txn.bnf)
+            pulled << txn.bnf
             if yield(txn) && !@wallets.acq(txn.bnf, &:exists?)
               @log.error("Paying wallet #{txn.bnf} file is absent even after PULL: \"#{txn.to_text}\"")
               next
             end
           end
           if @wallets.acq(txn.bnf, &:exists?) && !@wallets.acq(txn.bnf) { |p| p.includes_negative?(txn.id, wallet.id) }
+            if pulled.include?(txn.bnf)
+              @log.debug("The beneficiary #{@wallets.acq(txn.bnf, &:mnemo)} of #{@id} \
+doesn't have this transaction: \"#{txn.to_text}\"")
+              next
+            end
+            pulled << txn.bnf
             yield(txn)
             unless @wallets.acq(txn.bnf) { |p| p.includes_negative?(txn.id, wallet.id) }
               @log.debug("The beneficiary #{@wallets.acq(txn.bnf, &:mnemo)} of #{@id} \
@@ -130,25 +139,22 @@ doesn't have this transaction: \"#{txn.to_text}\"")
         end
         @txns << txn
         added += 1
-        if txn.amount.negative?
-          File.open(ledger, 'a') do |f|
-            f.puts(
-              [
-                Time.now.utc.iso8601,
-                txn.id,
-                txn.date.utc.iso8601,
-                wallet.id,
-                txn.bnf,
-                txn.amount.to_i * -1,
-                txn.prefix,
-                txn.details
-              ].map(&:to_s).join(';') + "\n"
-            )
-          end
+        next unless txn.amount.negative?
+        File.open(ledger, 'a') do |f|
+          f.puts(
+            [
+              Time.now.utc.iso8601,
+              txn.id,
+              txn.date.utc.iso8601,
+              wallet.id,
+              txn.bnf,
+              txn.amount.to_i * -1,
+              txn.prefix,
+              txn.details
+            ].map(&:to_s).join(';') + "\n"
+          )
         end
-        @log.debug("Merged on top, balance is #{@txns.map(&:amount).inject(&:+)}: #{txn.to_text}")
       end
-      @log.debug("#{seen} new txns arrived from #{wallet.mnemo}, #{added} of them added to the patch")
     end
 
     def empty?

data/lib/zold/version.rb

@@ -25,7 +25,7 @@
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 module Zold
-  VERSION = '0.29.21'
+  VERSION = '0.29.22'
   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.21
+  version: 0.29.22
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -798,7 +798,7 @@ licenses:
 - MIT
 metadata: {}
 post_install_message: |-
-  Thanks for installing Zold 0.29.21!
+  Thanks for installing Zold 0.29.22!
     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