zold 0.29.23 → 0.29.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 889105e0d182da51bc1e5f1404ac8a89e761ccbe3a01c2d8927093d5cbbea4b7
-  data.tar.gz: da4dc45dd27825ea6f36d361f9d8e0617bac70f3d8d333a1471b477987498b75
+  metadata.gz: d9d73aef08fbd3c164e8e65f6724f5a4e1c4c0fe2c821e9638df11326d943f5d
+  data.tar.gz: c6a1876c19f6905231e9758433b7743889302ae7527d20134165f6ece45dbd5f
 SHA512:
-  metadata.gz: 4378c9164cde07bc3d52df96df215632ef29c871c95cb9e6838550bd4e6b72761d3f3a8e7a73cce3e4f7825b38eb4f2d939d9ffbf49cd05edc15514c8ad32ff0
-  data.tar.gz: 39a8d2951f30122c8abe0da442800c1bac410cc0daeafc8000ac1b7ee5dedbfa179301778c2d44692fefcc50f69effd4b6aa7a42ef64e72d3771070d5994c43d
+  metadata.gz: b02b08e81d5b55735f05d3358451b820d5271c45ff0bbb83242b3ebd4a52e65f5ee9f2f05f9473e06ddf0503e89a467f9a5ec9712450a2ced8c4e9330081ef6e
+  data.tar.gz: 2fed2a3e01d2554774d96e54bd1a240f439541bec8e58fe19fa5cb5a254f91a5f09b39026c1a088e5fa92b06f89e82e057c37cd65decf1efb4c5981301098a2d

data/fixtures/merge/missed_wallets/opts

@@ -1,3 +1,3 @@
 --verbose
---deep
+--depth=2
 --no-baseline

data/fixtures/merge/unconfirmed_income/opts

@@ -1,3 +1,3 @@
 --verbose
---deep
+--depth=2
 --no-baseline

data/lib/zold/commands/clean.rb

@@ -74,7 +74,7 @@ Available options:"
       list = cps.all.map do |c|
         wallet = Wallet.new(c[:path])
         "#{c[:name]}: #{c[:score]} #{wallet.mnemo} \
-#{Size.new(File.size(c[:path]))}/#{Age.new(File.mtime(c[:path]))}"
+#{Size.new(File.size(c[:path]))}/#{Age.new(File.mtime(c[:path]))}#{c[:master] ? ' master' : ''}"
       end
       @log.debug(
         "#{deleted} expired local copies removed for #{cps} \

data/lib/zold/commands/fetch.rb

@@ -141,7 +141,7 @@ run 'zold remote update' or use --tolerate-quorum=1"
 #{total.value} from #{nodes.value} nodes (#{masters.value} master nodes)")
       list = cps.all.map do |c|
         "  ##{c[:name]}: #{c[:score]} #{Wallet.new(c[:path]).mnemo} \
-#{Size.new(File.size(c[:path]))}/#{Age.new(File.mtime(c[:path]))}"
+#{Size.new(File.size(c[:path]))}/#{Age.new(File.mtime(c[:path]))}#{c[:master] ? ' master' : ''}"
       end
       @log.debug("#{cps.all.count} local copies of #{id}:\n#{list.join("\n")}")
     end

data/lib/zold/commands/merge.rb

@@ -63,9 +63,9 @@ Available options:"
         o.bool '--quiet-if-absent',
           'Don\'t fail if the wallet is absent',
           default: false
-        o.bool '--deep',
-          'Try to pull other wallets if their confirmations are required, as deep as possible',
-          default: false
+        o.integer '--depth',
+          'How many levels down we try to pull other wallets if their confirmations are required (default: 0)',
+          default: 1
         o.bool '--allow-negative-balance',
           'Don\'t check for the negative balance of the wallet after the merge',
           default: false
@@ -119,8 +119,9 @@ Available options:"
       end
       cps.each_with_index do |c, idx|
         wallet = Wallet.new(c[:path])
-        name = "#{c[:name]}/#{idx}/#{c[:score]}"
-        merge_one(opts, patch, wallet, name, baseline: idx.zero? && c[:master] && !opts['no-baseline'])
+        baseline = idx.zero? && c[:master] && !opts['no-baseline']
+        name = "#{c[:name]}/#{idx}/#{c[:score]}#{baseline ? '/baseline' : ''}"
+        merge_one(opts, patch, wallet, name, baseline: baseline)
         score += c[:score]
       end
       @wallets.acq(id) do |w|
@@ -151,7 +152,7 @@ into #{@wallets.acq(id, &:mnemo)} in #{Age.new(start, limit: 0.1 + cps.count * 0
     def merge_one(opts, patch, wallet, name, baseline: false)
       start = Time.now
       @log.debug("Building a patch for #{wallet.id} from remote copy ##{name} with #{wallet.mnemo}...")
-      if opts['deep']
+      if opts['depth'].positive?
         patch.join(wallet, ledger: opts['ledger'], baseline: baseline) do |txn|
           trusted = IO.read(opts['trusted']).split(',')
           if trusted.include?(txn.bnf.to_s)
@@ -163,7 +164,7 @@ into #{@wallets.acq(id, &:mnemo)} in #{Age.new(start, limit: 0.1 + cps.count * 0
             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'] : []) +
+              ["--depth=#{opts['depth'] - 1}"] +
               (opts['no-baseline'] ? ['--no-baseline'] : []) +
               ["--trusted=#{Shellwords.escape(opts['trusted'])}"]
             )
@@ -172,7 +173,7 @@ into #{@wallets.acq(id, &:mnemo)} in #{Age.new(start, limit: 0.1 + cps.count * 0
         end
       else
         patch.join(wallet, ledger: opts['ledger'], baseline: baseline) do |txn|
-          @log.debug("Paying wallet #{txn.bnf} file is in question but it's not a deep MERGE: #{txn.to_text}")
+          @log.debug("Paying wallet #{txn.bnf} is incomplete but there is not enough depth to PULL: #{txn.to_text}")
           false
         end
       end

data/lib/zold/commands/pay.rb

@@ -45,6 +45,8 @@ module Zold
       @log = log
     end
 
+    # Sends a payment and returns the transaction just created in the
+    # paying wallet, an instance of Zold::Txn
     def run(args = [])
       opts = Slop.parse(args, help: true, suppress_errors: true) do |o|
         o.banner = "Usage: zold pay wallet target amount [details] [options]
@@ -101,12 +103,13 @@ Available options:"
       amount = amount(mine[2].strip)
       details = mine[3] || '-'
       taxes(id, opts)
-      @wallets.acq(id, exclusive: true) do |from|
+      txn = @wallets.acq(id, exclusive: true) do |from|
         pay(from, invoice, amount, details, opts)
       end
       return if opts['skip-propagate']
       require_relative 'propagate'
       Propagate.new(wallets: @wallets, log: @log).run(['propagate', id.to_s])
+      txn
     end
 
     private

data/lib/zold/node/front.rb

@@ -473,7 +473,7 @@ this is not a normal behavior, you may want to report a bug to our GitHub reposi
           title: '/journal',
           description: 'The journal',
           id: params[:id],
-          files: DirItems.new(settings.journal_dir).fetch.sort.reverse.select do |f|
+          files: DirItems.new(settings.journal_dir).fetch.sort.reverse.take(256).select do |f|
             !params[:id] || f.include?(params[:id])
           end,
           dir: settings.journal_dir

data/lib/zold/node/journaled_pipeline.rb

@@ -75,10 +75,10 @@ module Zold
     end
 
     # Returns a list of modifed wallets (as Zold::Id)
-    def push(id, body, wallets, log)
+    def push(id, body, wallets, log, lifetime: 6)
       DirItems.new(@dir).fetch.each do |f|
         f = File.join(@dir, f)
-        File.delete(f) if File.mtime(f) < Time.now - 24 * 60 * 60
+        File.delete(f) if File.mtime(f) < Time.now - lifetime * 60 * 60
       end
       journal = File.join(@dir, "#{Time.now.utc.iso8601.gsub(/[^0-9]/, '-')}-#{id}")
       jlog = Logger.new(journal)

data/lib/zold/node/pipeline.rb

@@ -87,13 +87,12 @@ module Zold
     def merge(id, copies, wallets, log)
       Tempfile.open do |f|
         modified = Tempfile.open do |t|
-          # host, port = @address.split(':')
+          host, port = @address.split(':')
           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)}"] +
-            ["--network=#{Shellwords.escape(@network)}"]
-            # Uncomment this line ASAP:
-            # (@remotes.master?(host, port.to_i) ? ['--no-baseline', '--deep'] : [])
+            ["--network=#{Shellwords.escape(@network)}"] +
+            (@remotes.master?(host, port.to_i) ? ['--no-baseline', '--depth=4'] : [])
           )
         end
         @mutex.synchronize do

data/lib/zold/remotes.rb

@@ -131,6 +131,10 @@ at #{response.headers['X-Zold-Path']}"
         []
       end
 
+      def master?(_, _)
+        true
+      end
+
       def iterate(_)
         # Nothing to do here
       end

data/lib/zold/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.29.23
+  version: 0.29.24
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-19 00:00:00.000000000 Z
+date: 2019-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace
@@ -798,7 +798,7 @@ licenses:
 - MIT
 metadata: {}
 post_install_message: |-
-  Thanks for installing Zold 0.29.23!
+  Thanks for installing Zold 0.29.24!
     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