zold 0.29.24 → 0.29.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9d73aef08fbd3c164e8e65f6724f5a4e1c4c0fe2c821e9638df11326d943f5d
-  data.tar.gz: c6a1876c19f6905231e9758433b7743889302ae7527d20134165f6ece45dbd5f
+  metadata.gz: 3267a66b285dc8f08ffc218d6f29bc75aa5553f6240125aee76fd06d4b897cdb
+  data.tar.gz: f27a3f796b2e43945595b5c5c1f74e883e573ae98ed865e9dad4588f16626a7d
 SHA512:
-  metadata.gz: b02b08e81d5b55735f05d3358451b820d5271c45ff0bbb83242b3ebd4a52e65f5ee9f2f05f9473e06ddf0503e89a467f9a5ec9712450a2ced8c4e9330081ef6e
-  data.tar.gz: 2fed2a3e01d2554774d96e54bd1a240f439541bec8e58fe19fa5cb5a254f91a5f09b39026c1a088e5fa92b06f89e82e057c37cd65decf1efb4c5981301098a2d
+  metadata.gz: 2d045eb1fff2a665a0e019264e6a2450aee1fd10f4737477c0075809233d433990960e205a134a401758cefb3c1da1b57707b8ecef3a9bcfd5a3857a242db7d0
+  data.tar.gz: 228fe183795be02c6331f44e57855afb5659211576285999c8346f8ce395b76b29b9c91f2c828a0c56a691f037ad4d06871bcf2ff03844be0eb42639ec03be4d

data/lib/zold/commands/merge.rb

@@ -72,6 +72,9 @@ Available options:"
         o.bool '--no-baseline',
           'Don\'t treat the highest score master copy as trustable baseline',
           default: false
+        o.bool '--edge-baseline',
+          'Use any strongest group of nodes as baseline, even if there are no masters inside (dangerous!)',
+          default: false
         o.string '--ledger',
           'The name of the file where all new negative transactions will be recorded (default: /dev/null)',
           default: '/dev/null'
@@ -103,7 +106,7 @@ Available options:"
 
     def merge(id, cps, opts)
       start = Time.now
-      cps = cps.all.sort_by { |c| c[:score] }.reverse
+      cps = cps.all(masters_first: !opts['edge-baseline'])
       patch = Patch.new(@wallets, log: @log)
       score = 0
       unless opts['skip-legacy']
@@ -119,7 +122,7 @@ Available options:"
       end
       cps.each_with_index do |c, idx|
         wallet = Wallet.new(c[:path])
-        baseline = idx.zero? && c[:master] && !opts['no-baseline']
+        baseline = idx.zero? && (c[:master] || opts['edge-baseline']) && !opts['no-baseline']
         name = "#{c[:name]}/#{idx}/#{c[:score]}#{baseline ? '/baseline' : ''}"
         merge_one(opts, patch, wallet, name, baseline: baseline)
         score += c[:score]
@@ -166,6 +169,7 @@ into #{@wallets.acq(id, &:mnemo)} in #{Age.new(start, limit: 0.1 + cps.count * 0
               ['pull', txn.bnf.to_s, "--network=#{Shellwords.escape(opts['network'])}", '--quiet-if-absent'] +
               ["--depth=#{opts['depth'] - 1}"] +
               (opts['no-baseline'] ? ['--no-baseline'] : []) +
+              (opts['edge-baseline'] ? ['--edge-baseline'] : []) +
               ["--trusted=#{Shellwords.escape(opts['trusted'])}"]
             )
           end

data/lib/zold/copies.rb

@@ -142,9 +142,9 @@ module Zold
       end
     end
 
-    def all
+    def all(masters_first: true)
       Futex.new(file, log: @log).open(false) do
-        load.group_by { |s| s[:name] }.map do |name, scores|
+        list = load.group_by { |s| s[:name] }.map do |name, scores|
           {
             name: name,
             path: File.join(@dir, "#{name}#{Copies::EXT}"),
@@ -154,7 +154,13 @@ module Zold
               .map { |s| s[:score] }
               .inject(&:+) || 0
           }
-        end.select { |c| File.exist?(c[:path]) }.sort_by { |c| [c[:master] ? 1 : 0, c[:score].to_s] }.reverse
+        end.select { |c| File.exist?(c[:path]) }
+        if masters_first
+          list.sort_by! { |c| [c[:master] ? 1 : 0, c[:score].to_s.rjust(5, '0')] }
+        else
+          list.sort_by! { |c| c[:score] }
+        end
+        list.reverse
       end
     end
 

data/lib/zold/node/front.rb

@@ -99,7 +99,7 @@ module Zold
       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...')
         Thread.start do
-          sleep 0.1
+          sleep 0.1 # to let the current request finish and close the socket
           Front.stop!
         end
       end

data/lib/zold/node/pipeline.rb

@@ -87,12 +87,13 @@ 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)}"] +
-            (@remotes.master?(host, port.to_i) ? ['--no-baseline', '--depth=4'] : [])
+            ['--edge-baseline']
+            # (@remotes.master?(host, port.to_i) ? ['--no-baseline', '--depth=4'] : [])
           )
         end
         @mutex.synchronize do

data/lib/zold/version.rb

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