zold 0.26.7 → 0.26.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e21eb76334ee1e9a8e7b80dbc6c43b62ad8381a1ee99e8ac780b937c14d0f418
-  data.tar.gz: 7b0a0e5c66a8cfcb7ca34a139be4223b5c42e32d10df6e6a79bc71a116d86d71
+  metadata.gz: 6ac37397e5ff256409bed9549fa390687d9948ece326adb44df42e4e56663341
+  data.tar.gz: 7783a1cb0a6ca7c98262f233980de0ecf77d2b5fb97a8f5f187c7a62f7be559e
 SHA512:
-  metadata.gz: a2a009ad5725c759219f5a94085eefbe82868237db58ccc52d66e6ff488fb5f10df27a48b32f832409d8371242cfe17e7b61b53519f766e97abee7dea784b667
-  data.tar.gz: ae6f4c9677dd2367f72582c5e663316755fe7710f44c6af177952a07739c1260ddfbbf644656141f4dac91f990756cfee130a5195f2746768c4cf0ed049816ba
+  metadata.gz: 34f7840aca58aa3f88b851df2da34de671d47028168e5bf3b2999fefc0c0cf8136d449ea93861f1e95444cb91a8d465a1c3708522395f1014037640d266b59c3
+  data.tar.gz: a3a6af3bb00938418bacb448f0de1a7e8ab91574a93779608ce57640947174a474ee4f4fef9fa999eb891e72ca61df1b76bc1ca8340f4632599455821121aa3b

data/fixtures/merge/missed_wallets/0000000000000000.z

@@ -0,0 +1,6 @@
+test
+1
+0000000000000000
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAnppnkzrCreiKaHF09XKS6bO+2274+wSGo+F8KHvVrNbqear/e09r9PB/P6bFdLoMh4Xc7p/7+NSEZLeu2Eg/dBkQLEb8M/zgkT4gBDGyETW/zusYHIznX/lgf0f8qleIQIIB/3Y7QpDztkamWYTKWlnmlrcQvCVB0uRRPm4ZMcMJouKR9n7E2DpL9eolKyOwr/JY08iJOuK3HuW6tRdvE+0x7I+wDprM65OH/PoArlfO5qnIGbeXwsEGRXt0w6a/ubPpeadFjPXotE7cT1SA4YSD1tWTIVm1ZWppOE967XoDIum6tzt5KfzDNRfs9GbCfO0BL235HxbO8I9rTlVLTKcNAiEe0CWolY9HR5pMaosOgZ6PB54InJEZJs4L2b10c+IlVUX1RSnwfFYg0vy5oqrYyqt7gnipl/06YW4PKIYc7TljogsEHf9Cz/kpEKzqDtsH2LrmjMNsbWiousvNHM+MPgcuMg8ZnwLKwDy9NWdI4XLTpg6hVRJNH9erZdfAO5tg/3ub3JLeJbyNo4Bd5f/Bnr5YN/9ahZ87kSpI7v0Qk94dR4hDPjstEcghyZ9RVUoN52+h1g83cd3cIqksJd0kifMCoBmObD013RSPQqNwr9GGU2JaJEm25Vq35dy2DHAkOQpUZVT8GNg9IM4qUDV0yagTN3bZyvuLWIgufb0CAwEAAQ==
+
+0001;2018-06-22T07:38:23Z;fffffe0000000000;g6hVRJNH;0123456789abcdef;To help you;IFQvo0PN3JkpkuZRjPyQ6BywuM9aSRFI6GdNOevSQxWJMwSesYp6b25KIi78TcIV9b84f0Qr96d8TgvkTjLqczvZZzyYIJ+e2w8qQhbxSiCgFxfThm6U8NnrXNprMBRHg4amV40dAjgW2lfVDDRk+RtCYEUEZDX5xPhiCHC8lhtoJm/atgJfgOIAfeLTy6ZWwC+teMtHUt6/uHH9z9giYnWHLBpYFyjYSSlrf4K/0e86Kzy/8Bwmk9Q/I6Yvo7IWL7TNN5vCGiz74R2wUTHVfmlY/YdXD15JnPmmZGjoR+BCjxbpjPqYWGm2bTxSuDHCFg0oTKAHIPqC57hKzGQUNzmoSqMHxTBDTvdLHjf0Uo9oaWhdT+BTpnGzFJxgz7d9oJOsIFqrLzPZ6VjOqKtl+ptbFkrjpq9ZdfpbzzBxHhLU8quxmBihodxBZAI6f2rpDGgnwS/D2v+Ncdcmqpdin1GkU0lAeAzWhenKBqu2t9C5UeZbjw6diiKyrGPHWLS9X9BGX9j6STMyI93f81Y6+j798gqv+XZtsohxL/sHDNJK0m81S6QWnAD//bZbNqW85y8ZMFwHmn3GXsSDupaQGpe6wpvFknWxho4vM8A/nAk20rWur5PF1S4RpFwpOr/4RmBA06yWnPxdB6x9lonPKmYC5Pck0fwxXDOEcjMTdWo=

data/fixtures/merge/missed_wallets/0123456789abcdef.z

@@ -0,0 +1,6 @@
+test
+1
+0123456789abcdef
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAnppnkzrCreiKaHF09XKS6bO+2274+wSGo+F8KHvVrNbqear/e09r9PB/P6bFdLoMh4Xc7p/7+NSEZLeu2Eg/dBkQLEb8M/zgkT4gBDGyETW/zusYHIznX/lgf0f8qleIQIIB/3Y7QpDztkamWYTKWlnmlrcQvCVB0uRRPm4ZMcMJouKR9n7E2DpL9eolKyOwr/JY08iJOuK3HuW6tRdvE+0x7I+wDprM65OH/PoArlfO5qnIGbeXwsEGRXt0w6a/ubPpeadFjPXotE7cT1SA4YSD1tWTIVm1ZWppOE967XoDIum6tzt5KfzDNRfs9GbCfO0BL235HxbO8I9rTlVLTKcNAiEe0CWolY9HR5pMaosOgZ6PB54InJEZJs4L2b10c+IlVUX1RSnwfFYg0vy5oqrYyqt7gnipl/06YW4PKIYc7TljogsEHf9Cz/kpEKzqDtsH2LrmjMNsbWiousvNHM+MPgcuMg8ZnwLKwDy9NWdI4XLTpg6hVRJNH9erZdfAO5tg/3ub3JLeJbyNo4Bd5f/Bnr5YN/9ahZ87kSpI7v0Qk94dR4hDPjstEcghyZ9RVUoN52+h1g83cd3cIqksJd0kifMCoBmObD013RSPQqNwr9GGU2JaJEm25Vq35dy2DHAkOQpUZVT8GNg9IM4qUDV0yagTN3bZyvuLWIgufb0CAwEAAQ==
+
+

data/fixtures/merge/missed_wallets/assert.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2018-2019 Zerocracy, Inc.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the 'Software'), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require_relative 'asserts.rb'
+wallet = Zold::Wallet.new('0123456789abcdef.z')
+assert_equal(Zold::Amount.new(zld: 496.0), wallet.balance)

data/fixtures/merge/missed_wallets/copies/0123456789abcdef/1.zc

@@ -0,0 +1,8 @@
+test
+1
+0123456789abcdef
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAnppnkzrCreiKaHF09XKS6bO+2274+wSGo+F8KHvVrNbqear/e09r9PB/P6bFdLoMh4Xc7p/7+NSEZLeu2Eg/dBkQLEb8M/zgkT4gBDGyETW/zusYHIznX/lgf0f8qleIQIIB/3Y7QpDztkamWYTKWlnmlrcQvCVB0uRRPm4ZMcMJouKR9n7E2DpL9eolKyOwr/JY08iJOuK3HuW6tRdvE+0x7I+wDprM65OH/PoArlfO5qnIGbeXwsEGRXt0w6a/ubPpeadFjPXotE7cT1SA4YSD1tWTIVm1ZWppOE967XoDIum6tzt5KfzDNRfs9GbCfO0BL235HxbO8I9rTlVLTKcNAiEe0CWolY9HR5pMaosOgZ6PB54InJEZJs4L2b10c+IlVUX1RSnwfFYg0vy5oqrYyqt7gnipl/06YW4PKIYc7TljogsEHf9Cz/kpEKzqDtsH2LrmjMNsbWiousvNHM+MPgcuMg8ZnwLKwDy9NWdI4XLTpg6hVRJNH9erZdfAO5tg/3ub3JLeJbyNo4Bd5f/Bnr5YN/9ahZ87kSpI7v0Qk94dR4hDPjstEcghyZ9RVUoN52+h1g83cd3cIqksJd0kifMCoBmObD013RSPQqNwr9GGU2JaJEm25Vq35dy2DHAkOQpUZVT8GNg9IM4qUDV0yagTN3bZyvuLWIgufb0CAwEAAQ==
+
+0001;2018-06-22T07:38:23Z;0000020000000000;g6hVRJNH;0000000000000000;To help you;
+0001;2018-06-22T07:38:23Z;0000020000000000;g6hVRJNH;0000000000000001;From a missing wallet;
+0001;2018-06-22T08:26:19Z;fffffff000000000;TESTPREFIX;ffffffffffffffff;For pizza;L1MFiKqM8O6Eg/v54TD7M48gI/oq7iYYmjM7cKgUpMUk7dx48K+9DRQ2as+d2SrMMH/TKdJ/It8v8DJN6RV3kVtpdZo7CsUrUisive5rpJduO68+nJFr3TB3vQrCPm8N3Cz9vfmM68WrmskPHOABETyIC9cSQrSIvaCWhchwru7sO0625y2aYiMVoW2jmKFTtflGr6M9n7rqTkaYG/EftrNMrJS7PaG19T1HOQupAcKQ4DzBujEnbm3KQQc9Rp5GR8cb49Y38IAr9lENkDB1zmMaVJeZNEyX0ne6S1ZB7Ys9L0jUIJA+SRzNHDEdWC6lcOifcCuanU4kBPFtOiuAjghJX09l8Ue1pyE478+Sy8BgApqKu1l4+p+qUSXOTx7yKwT9ahZaA9DgVHEinz6MqhiozDddw24fXRK956pQ+jUPzNJXVeH4UrDcUDAaCIX8jCaaqGQUqhJXH2KF0Z1PtWBfHYB7OxXEpiVVtScMQ+68iB40p71f7j4YrVW50G89NrCJbOamdai+3dmwiIZzSOsSahB8kXrkaF+lrDZiwNPfL2ixs3F2xW34aKHvA/UCCo7PVfUVDLC8VHiDtAKTSyoqhPP4ocomszfRaRGxSjDIh3ceCrPH9BIW2zfUzkU63+dJ5adS+XSXzO3L3gfwiLM6XPr2jlJbPy1OSMkDK7s=

data/fixtures/merge/missed_wallets/copies/0123456789abcdef/scores.zc

@@ -0,0 +1 @@
+1,0.0.0.0,4096,10,NOW,M

data/fixtures/merge/missed_wallets/opts

@@ -0,0 +1 @@
+--verbose

data/lib/zold/commands/fetch.rb

@@ -109,7 +109,10 @@ Available options:"
     private
 
     def fetch(id, cps, opts)
-      raise "There are no remote nodes, run 'zold remote reset'" if @remotes.all.empty?
+      if @remotes.all.empty?
+        return if opts['quiet-if-absent']
+        raise "There are no remote nodes, run 'zold remote reset'"
+      end
       start = Time.now
       total = Concurrent::AtomicFixnum.new
       nodes = Concurrent::AtomicFixnum.new
@@ -190,7 +193,7 @@ as copy ##{copy}/#{cps.all.count} in #{Age.new(start, limit: 4)}: \
       begin
         uri = "/wallet/#{id}"
         head = r.http(uri).get
-        raise "The wallet #{id} doesn't exist at #{r}" if head.status == 404
+        raise Fetch::Error, "The wallet #{id} doesn't exist at #{r}" if head.status == 404
         r.assert_code(200, head)
         json = JsonPage.new(head.body, uri).to_hash
         score = Score.parse_json(json['score'])
@@ -198,7 +201,7 @@ as copy ##{copy}/#{cps.all.count} in #{Age.new(start, limit: 4)}: \
       rescue JsonPage::CantParse, Score::CantParse, RemoteNode::CantAssert => e
         attempt += 1
         if attempt < opts['retry']
-          @log.error("#{r} failed to fetch #{id}, trying again (attempt no.#{attempt}): #{e.message}")
+          @log.debug("#{r} failed to fetch #{id}, trying again (attempt no.#{attempt}): #{e.message}")
           retry
         end
         raise e

data/lib/zold/commands/merge.rb

@@ -59,6 +59,9 @@ Available options:"
         o.bool '--skip-legacy',
           'Don\'t make legacy transactions (older than 24 hours) immutable',
           default: false
+        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
@@ -116,7 +119,10 @@ Available options:"
           @log.debug("Local copy of #{id} is absent, nothing to merge")
         end
       end
-      raise "There are no copies of #{id}, nothing to merge" if patch.empty?
+      if patch.empty?
+        return if opts['quiet-if-absent']
+        raise "There are no copies of #{id}, nothing to merge"
+      end
       modified = @wallets.acq(id, exclusive: true) { |w| patch.save(w.path, overwrite: true) }
       if modified
         @log.info("#{cps.count} copies with the total score of #{score} successfully merged \
@@ -138,7 +144,7 @@ into #{@wallets.acq(id, &:mnemo)} in #{Age.new(start, limit: 0.1 + cps.count * 0
       else
         patch.join(wallet, ledger: opts['ledger']) do |txn|
           Pull.new(wallets: @wallets, remotes: @remotes, copies: @copies, log: @log).run(
-            ['pull', txn.bnf.to_s, "--network=#{opts['network']}", '--shallow']
+            ['pull', txn.bnf.to_s, "--network=#{opts['network']}", '--shallow', '--quiet-if-absent']
           )
           true
         end

data/lib/zold/commands/pay.rb

@@ -66,6 +66,9 @@ Available options:"
         o.string '--time',
           "Time of transaction (default: #{Time.now.utc.iso8601})",
           default: Time.now.utc.iso8601
+        o.string '--keygap',
+          'Keygap, if the private RSA key is not complete',
+          default: ''
         o.bool '--tolerate-edges',
           'Don\'t fail if only "edge" (not "master" ones) nodes have the wallet',
           default: false
@@ -120,7 +123,7 @@ Available options:"
       return unless debt
       require_relative 'taxes'
       Taxes.new(wallets: @wallets, remotes: @remotes, log: @log).run(
-        ['taxes', 'pay', "--private-key=#{opts['private-key']}", id.to_s]
+        ['taxes', 'pay', "--private-key=#{opts['private-key']}", id.to_s, "--keygap=#{opts['keygap']}"]
       )
     end
 
@@ -133,7 +136,12 @@ Available options:"
 the difference is #{(amount - from.balance).to_i} zents"
         end
       end
-      key = Zold::Key.new(file: opts['private-key'])
+      pem = IO.read(opts['private-key'])
+      unless opts['keygap'].empty?
+        pem = pem.sub('*' * opts['keygap'].length, opts['keygap'])
+        @log.debug("Keygap \"#{'*' * opts['keygap'].length}\" injected into the RSA private key")
+      end
+      key = Zold::Key.new(text: pem)
       txn = from.sub(amount, invoice, key, details, time: Txn.parse_time(opts['time']))
       @log.debug("#{amount} sent from #{from} to #{txn.bnf}: #{details}")
       @log.debug("Don't forget to do 'zold push #{from}'")

data/lib/zold/commands/taxes.rb

@@ -78,6 +78,9 @@ Available options:"
         o.bool '--ignore-score-weakness',
           'Don\'t complain when their score is too weak',
           default: false
+        o.string '--keygap',
+          'Keygap, if the private RSA key is not complete',
+          default: ''
         o.bool '--ignore-nodes-absence',
           'Don\'t complain if there are not enough nodes in the network to pay taxes',
           default: false
@@ -145,7 +148,12 @@ the balance is #{wallet.balance}: #{tax.to_text}")
           @log.debug("The score has already been taxed: #{best}")
           next
         end
-        txn = tax.pay(Zold::Key.new(file: opts['private-key']), best)
+        pem = IO.read(opts['private-key'])
+        unless opts['keygap'].empty?
+          pem = pem.sub('*' * opts['keygap'].length, opts['keygap'])
+          @log.debug("Keygap \"#{'*' * opts['keygap'].length}\" injected into the RSA private key")
+        end
+        txn = tax.pay(Zold::Key.new(text: pem), best)
         debt += txn.amount
         paid += 1
         @log.info("#{txn.amount * -1} of taxes paid from #{wallet.id} to #{txn.bnf} \

data/lib/zold/patch.rb

@@ -83,8 +83,11 @@ module Zold
         @log.error("Wallet ID mismatch, ours is #{@id}, theirs is #{wallet.id}")
         return
       end
+      seen = 0
+      added = 0
       wallet.txns.each do |txn|
         next if @txns.find { |t| t == txn }
+        seen += 1
         if txn.amount.negative?
           dup = @txns.find { |t| t.id == txn.id && t.amount.negative? }
           if dup
@@ -129,6 +132,7 @@ doesn't have this transaction: \"#{txn.to_text}\"")
           end
         end
         @txns << txn
+        added += 1
         if txn.amount.negative?
           File.open(ledger, 'a') do |f|
             f.puts(
@@ -147,6 +151,7 @@ doesn't have this transaction: \"#{txn.to_text}\"")
         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/remotes.rb

@@ -215,8 +215,12 @@ at #{response.headers['X-Zold-Path']}"
           unerror(r[:host], r[:port]) if node.touched
         rescue StandardError => e
           error(r[:host], r[:port])
-          log.info("#{Rainbow(node).red}: \"#{e.message.strip}\" in #{Age.new(start)}")
-          log.debug(Backtrace.new(e).to_s)
+          if e.is_a?(RemoteNode::CantAssert) || e.is_a?(Fetch::Error)
+            log.debug("#{Rainbow(node).red}: \"#{e.message.strip}\" in #{Age.new(start)}")
+          else
+            log.info("#{Rainbow(node).red}: \"#{e.message.strip}\" in #{Age.new(start)}")
+            log.debug(Backtrace.new(e).to_s)
+          end
           remove(r[:host], r[:port]) if r[:errors] > TOLERANCE
         end
       end

data/lib/zold/version.rb

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

data/test/commands/test_pay.rb

@@ -82,6 +82,25 @@ class TestPay < Zold::Test
     end
   end
 
+  def test_pay_with_keygap
+    FakeHome.new(log: test_log).run do |home|
+      wallet = home.create_wallet
+      amount = Zold::Amount.new(zld: 2.0)
+      Tempfile.open do |f|
+        pem = IO.read('fixtures/id_rsa')
+        keygap = pem[100..120]
+        IO.write(f, pem.gsub(keygap, '*' * keygap.length))
+        Zold::Pay.new(wallets: home.wallets, copies: home.dir, remotes: home.remotes, log: test_log).run(
+          [
+            'pay', '--force', "--private-key=#{f.path}", "--keygap=#{keygap}",
+            wallet.id.to_s, 'NOPREFIX@dddd0000dddd0000', amount.to_zld, '-'
+          ]
+        )
+      end
+      assert_equal(amount * -1, wallet.balance)
+    end
+  end
+
   def test_pay_in_many_threads
     FakeHome.new(log: test_log).run do |home|
       wallet = home.create_wallet

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.26.7
+  version: 0.26.8
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-07 00:00:00.000000000 Z
+date: 2019-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace
@@ -580,6 +580,12 @@ files:
 - fixtures/merge/legacy_negatives_stay/copies/0123456789abcdef/1.zc
 - fixtures/merge/legacy_negatives_stay/copies/0123456789abcdef/scores.zc
 - fixtures/merge/legacy_negatives_stay/opts
+- fixtures/merge/missed_wallets/0000000000000000.z
+- fixtures/merge/missed_wallets/0123456789abcdef.z
+- fixtures/merge/missed_wallets/assert.rb
+- fixtures/merge/missed_wallets/copies/0123456789abcdef/1.zc
+- fixtures/merge/missed_wallets/copies/0123456789abcdef/scores.zc
+- fixtures/merge/missed_wallets/opts
 - fixtures/merge/random_expenses/0000000000000000.z
 - fixtures/merge/random_expenses/0123456789abcdef.z
 - fixtures/merge/random_expenses/assert.rb
@@ -764,7 +770,7 @@ licenses:
 - MIT
 metadata: {}
 post_install_message: |-
-  Thanks for installing Zold 0.26.7!
+  Thanks for installing Zold 0.26.8!
     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