zold 0.29.22 → 0.29.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b4542141ab23f1369c77e16a27e14999b91d20fc7d9a44e15951cdae5cefa41
-  data.tar.gz: ff130bde3e777a600141445f1367cc3f0738d870887591f890e49b8171e14846
+  metadata.gz: 889105e0d182da51bc1e5f1404ac8a89e761ccbe3a01c2d8927093d5cbbea4b7
+  data.tar.gz: da4dc45dd27825ea6f36d361f9d8e0617bac70f3d8d333a1471b477987498b75
 SHA512:
-  metadata.gz: 17f943b32fd7d8d2a9140cd4a2212573e2f90afd9a7b59a539d3550f5861f1c7fd0addf89f2eac16b493d78049bddc1e382b342d65b0375e2e6648750b17ceb4
-  data.tar.gz: 961b59b291f64b5d4369f5191a07809528198d47a502212b8461c7c87bd4f849e60f71e1944aa6279a5f5d3085f02ef9dead8324b979f569adce40bed2a132ab
+  metadata.gz: 4378c9164cde07bc3d52df96df215632ef29c871c95cb9e6838550bd4e6b72761d3f3a8e7a73cce3e4f7825b38eb4f2d939d9ffbf49cd05edc15514c8ad32ff0
+  data.tar.gz: 39a8d2951f30122c8abe0da442800c1bac410cc0daeafc8000ac1b7ee5dedbfa179301778c2d44692fefcc50f69effd4b6aa7a42ef64e72d3771070d5994c43d

data/fixtures/merge/into_no_wallet/opts

@@ -1 +1 @@
---shallow
+--verbose

data/fixtures/merge/missed_wallets/opts

@@ -1 +1,3 @@
---verbose
+--verbose
+--deep
+--no-baseline

data/fixtures/merge/unconfirmed_income/opts

@@ -1 +1,3 @@
---verbose
+--verbose
+--deep
+--no-baseline

data/lib/zold/commands/merge.rb

@@ -63,15 +63,15 @@ Available options:"
         o.bool '--quiet-if-absent',
           'Don\'t fail if the wallet is absent',
           default: false
-        o.bool '--shallow',
-          'Don\'t try to pull other wallets if their confirmations are required',
-          default: false
         o.bool '--deep',
           'Try to pull other wallets if their confirmations are required, as deep as possible',
           default: false
         o.bool '--allow-negative-balance',
           'Don\'t check for the negative balance of the wallet after the merge',
           default: false
+        o.bool '--no-baseline',
+          'Don\'t treat the highest score master copy as trustable baseline',
+          default: false
         o.string '--ledger',
           'The name of the file where all new negative transactions will be recorded (default: /dev/null)',
           default: '/dev/null'
@@ -80,7 +80,7 @@ Available options:"
           default: '/dev/null'
         o.integer '--trusted-max',
           'The maximum amount of trusted wallets we can see in the list',
-          default: 32
+          default: 128
         o.string '--network',
           'The name of the network we work in',
           default: 'test'
@@ -120,7 +120,7 @@ Available options:"
       cps.each_with_index do |c, idx|
         wallet = Wallet.new(c[:path])
         name = "#{c[:name]}/#{idx}/#{c[:score]}"
-        merge_one(opts, patch, wallet, name)
+        merge_one(opts, patch, wallet, name, baseline: idx.zero? && c[:master] && !opts['no-baseline'])
         score += c[:score]
       end
       @wallets.acq(id) do |w|
@@ -148,16 +148,11 @@ into #{@wallets.acq(id, &:mnemo)} in #{Age.new(start, limit: 0.1 + cps.count * 0
       modified
     end
 
-    def merge_one(opts, patch, wallet, name)
+    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['shallow']
-        patch.join(wallet, ledger: opts['ledger']) do |txn|
-          @log.debug("Paying wallet #{txn.bnf} file is in question but it's a \"shallow\" MERGE: #{txn.to_text}")
-          false
-        end
-      else
-        patch.join(wallet, ledger: opts['ledger']) do |txn|
+      if opts['deep']
+        patch.join(wallet, ledger: opts['ledger'], baseline: baseline) do |txn|
           trusted = IO.read(opts['trusted']).split(',')
           if trusted.include?(txn.bnf.to_s)
             @log.debug("Won't PULL #{txn.bnf} since it is already trusted, among #{trusted.count} others")
@@ -168,12 +163,18 @@ 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'] : ['--shallow']) +
+              (opts['deep'] ? ['--deep'] : []) +
+              (opts['no-baseline'] ? ['--no-baseline'] : []) +
               ["--trusted=#{Shellwords.escape(opts['trusted'])}"]
             )
           end
           true
         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}")
+          false
+        end
       end
       @log.debug("Copy ##{name} of #{wallet.id} merged in #{Age.new(start)}: #{patch}")
     rescue StandardError => e

data/lib/zold/node/pipeline.rb

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

data/lib/zold/patch.rb

@@ -65,7 +65,11 @@ module Zold
     # not present, it's a failure, don't accept the transaction. FALSE will mean
     # that the transaction should be accepted, even if the paying wallet is
     # absent.
-    def join(wallet, ledger: '/dev/null')
+    #
+    # The "baseline" flag, when set to TRUE, means that we should NOT validate
+    # the presence of positive incoming transactions in their correspondent
+    # wallets. We shall just trust them.
+    def join(wallet, ledger: '/dev/null', baseline: false)
       if @id.nil?
         @id = wallet.id
         @key = wallet.key
@@ -115,25 +119,35 @@ 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
+            if baseline
+              @log.debug("Paying wallet #{txn.bnf} is absent, but the txn in in the baseline: \"#{txn.to_text}\"")
+            else
+              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
           end
-          if @wallets.acq(txn.bnf, &:exists?) && !@wallets.acq(txn.bnf) { |p| p.includes_negative?(txn.id, wallet.id) }
-            if pulled.include?(txn.bnf)
+          if @wallets.acq(txn.bnf, &:exists?) &&
+            !@wallets.acq(txn.bnf) { |p| p.includes_negative?(txn.id, wallet.id) }
+            if baseline
               @log.debug("The beneficiary #{@wallets.acq(txn.bnf, &:mnemo)} of #{@id} \
+doesn't have this transaction, but we trust it, since it's a baseline: \"#{txn.to_text}\"")
+            else
+              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} \
+                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} \
 doesn't have this transaction: \"#{txn.to_text}\"")
-              next
+                next
+              end
             end
           end
         end

data/lib/zold/version.rb

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

data/test/test_copies.rb

@@ -73,8 +73,10 @@ class TestCopies < Zold::Test
   def test_master_first
     Dir.mktmpdir do |dir|
       copies = Zold::Copies.new(File.join(dir, 'my/a/copies-2'), log: test_log)
-      copies.add(content('z1'), 'master', 80, 100, master: false)
-      copies.add(content('z2'), 'edge', 80, 1, master: true)
+      copies.add(content('z1'), 'edge-1', 80, 100, master: false)
+      copies.add(content('z2'), 'master', 80, 1, master: true)
+      copies.add(content('z1'), 'edge-2', 80, 50, master: false)
+      copies.add(content('z1'), 'edge-3', 80, 400, master: false)
       assert(copies.all[0][:master])
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.29.22
+  version: 0.29.23
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -798,7 +798,7 @@ licenses:
 - MIT
 metadata: {}
 post_install_message: |-
-  Thanks for installing Zold 0.29.22!
+  Thanks for installing Zold 0.29.23!
     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