zold 0.22.6 → 0.22.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 193ffcae400705f2d5f2957ba17f591f33b2a9b51a323e7a4f83316a68b1587f
-  data.tar.gz: 9b7ce3f388c051857120385410230501753f3fcd0bfe57f8775fdfd95758cb66
+  metadata.gz: c98e24178b0b7da594111beaa66a1461d04aa876efafe8b66baa2862fbef5029
+  data.tar.gz: a9cf58c9298c540621ec5bf779e3385072142dc9b727a04ea2cca1142e37ef46
 SHA512:
-  metadata.gz: 959076ef2e3d3ba09df404fc013fa65a8ce36c4b62660194d4cc7abd76b48a4254dae3cba07ea2bd26705e19f2b2a8cc71c33f81cb8d3f21631feae7e7ba12c0
-  data.tar.gz: 68442b0b6d3823898ed9a026e57f93f0bfd88c793ceb92fe8f70c1ae8b9addfc0f86c0217cb67cf58592ea4768b47549b2d6f1ebd527fba6a2c5600af1f7a9da
+  metadata.gz: a53f3e0a978221f70fe989b8b2f4230630a34a816a3e9a580b54fb3a8e2b12c4a3cd48a46500b33e41d7ce833bfa52ad78c9aba4410ee56ee6c8a04e4918a4df
+  data.tar.gz: a511a6b96eb83db16b51c7f8db2b8613bc83d8789a0fbd0b1078c6204e6c4772a76966a4d5a42e4516b02aaafbd90ccb63747b1b7469c39348e70f8874cbc980

data/fixtures/merge/legacy-negatives-stay/0123456789abcdef.z

@@ -0,0 +1,6 @@
+test
+2
+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-01-01T01:01:01Z;fffffff700000000;helloyou;abcdabcdabcdabcd;for fun;Mx86AcOsjN8lQ4ugfBCjB1yVNniYPbZCWXWyvYjc00uUmmXt1OumjVJxX6xt127n2VUWEUXZsTmIw5sUtwpkDE1cvIL+jnaxJ5RaGsJsawbm2QRxL8SBiqKRkIm+lzCBrARe06K5GUaMkOpU9JORfPRr+RuhIbA20KcuD7s2N/aw7R7CLFMNCAljGGe6jKp92LFatnP3nL+y4b3TL8IGlWKFCdf3q+Ng9f+9pj8CMjzTCUapvWt55Gzol7+Fge5Jj+6OwdjqJavxDtPgjz/ZdXxl+jrigL7A0RU+xsqwzP8cXkGXJZjilesoy0uoExHsyP+xSmrIbJE1dVGZX+EglMym4wnlm7Nn2R0MIjQ9JOTSE+nlAUjsXiO7zJ3qvQvpZh0VV3TsSOOtvTGksPAGAYTpkvtlHB/4ptl8yI6abz2qeD3rtZeL3uXKhz1Xy6NWKjX/of/xeqkI/bfHE+OkUmjVOzBlQIgws/ibKkawqeR/GkA7ZKIizsDdOdcVIdWZQIlguILNgB4VWsr+zxpwdliYQA1j9DLSNkAu2E329v63TTXJVOBV4tQIVaiPW+D0T4fSoDdF1G/+uIrD0OEnQDATzT1M2fF/xkwnUYS1nBZUkhVvVRXtAHIcAzFpoeQL0iUS5HKip4mxfpb8qrozP8mPD6Uq9aiTNuzPtxi2NN4=

data/fixtures/merge/legacy-negatives-stay/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: -9.0), wallet.balance)

data/fixtures/merge/legacy-negatives-stay/copies/0123456789abcdef/1.zc

@@ -0,0 +1,6 @@
+test
+2
+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;2019-01-30T17:38:07Z;ffffffce00000000;helloyou;abcdabcdabcdabcd;for fun;MVRb2v82hcujyKi2s6b8TePpzupfJ67PnYGau33b8dXBsLRjDX2Ttm+m1ieZLqB9lcaIDr3XKMG/tZEnz6kj6w4Ya6jryt8XHo/9ae2LRSa83aa6LjXJmb5mroKiwpQeFPqojY2mDRnr7FvERi4ctbYvu6l+bDdgX/zp2epK8lGToPHO6Hl4j1aTEOWBmm9KDSRKsRWfJJvC01wz71o3S4vDiH+LTLw21Ymw9nb4tXGXt8nG2mjJO0UcwJsLkMBv9yk4UHXbHlo1BXg+FyJr26ICXgW7ooCgOWNhc782IMoKAE2ZH2tLKvOO5ceNx5QjQ8dL2gjAbBo2MlZeXs9YAOaf+B5+Po+lkxiESMZm5/u8+T8H3BwZHEq+u/IS2AbSkwFwtHSWqSw2t+xhrDViUqPv8cYwFTgl0mNdTbfi9qL7US/Lo3iJhUKskwfhkDjnfl2ukfvQ1sU3hfarfT6RV/PfZigLqTqdBq5h+qmPdCdSdNg2QXXeCZUslLzXVtFfMHYHQYLlK4B3Ih9rGhuXqVxLL67K4AdoT+BhIhod27DcQrIro1CvtjoRKQxTcsXgDeMkGDczLrqu8FCsHXPRSAoAuBj+kx+GzPAhQf9YVjX1KOFzb/HEnJd7oT6FYRaurHumXHtxzVf3986+KIc4eqkOvuDetwsWD+htkDsNBBg=

data/fixtures/merge/legacy-negatives-stay/copies/0123456789abcdef/scores.zc

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

data/lib/zold/commands/merge.rb

@@ -53,9 +53,6 @@ module Zold
       opts = Slop.parse(args, help: true, suppress_errors: true) do |o|
         o.banner = "Usage: zold merge [ID...] [options]
 Available options:"
-        o.bool '--no-baseline',
-          'Don\'t trust any remote copies and re-validate all incoming payments against their wallets',
-          default: false
         o.bool '--skip-propagate',
           'Don\'t propagate after merge',
           default: false
@@ -94,15 +91,17 @@ Available options:"
         @wallets.acq(id) do |w|
           if w.exists?
             s = Time.now
-            merge_one(opts, patch, w, 'localhost', baseline: false, legacy: true)
-            @log.debug("Local legacy copy of #{id} merged in #{Age.new(s)}: #{patch}")
+            patch.legacy(w)
+            @log.debug("Local copy of #{id} merged legacy in #{Age.new(s)}: #{patch}")
+          else
+            @log.debug("There is no local copy to merge legacy of #{id}")
           end
         end
       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: !opts['no-baseline'])
+        merge_one(opts, patch, wallet, name)
         score += c[:score]
       end
       @wallets.acq(id) do |w|
@@ -125,11 +124,13 @@ into #{@wallets.acq(id, &:mnemo)} in #{Age.new(start, limit: 0.1 + cps.count * 0
       modified
     end
 
-    def merge_one(opts, patch, wallet, name, baseline: false, legacy: false)
+    def merge_one(opts, patch, wallet, name)
       start = Time.now
       @log.debug("Building a patch for #{wallet.id} from remote copy ##{name} with #{wallet.mnemo}...")
-      patch.join(wallet, baseline: baseline, legacy: legacy) do |id|
-        unless opts['shallow']
+      if opts['shallow']
+        patch.join(wallet)
+      else
+        patch.join(wallet) do |id|
           Pull.new(wallets: @wallets, remotes: @remotes, copies: @copies, log: @log).run(
             ['pull', id.to_s, "--network=#{opts['network']}", '--shallow']
           )

data/lib/zold/commands/pay.rb

@@ -60,6 +60,9 @@ Available options:"
         o.bool '--force',
           'Ignore all validations',
           default: false
+        o.string '--time',
+          "Time of transaction (default: #{Time.now.utc.iso8601})",
+          default: Time.now.utc.iso8601
         o.bool '--tolerate-edges',
           'Don\'t fail if only "edge" (not "master" ones) nodes have the wallet',
           default: false
@@ -121,7 +124,7 @@ Available options:"
         end
       end
       key = Zold::Key.new(file: opts['private-key'])
-      txn = from.sub(amount, invoice, key, details)
+      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}'")
       @log.info(txn.id)

data/lib/zold/node/entrance.rb

@@ -79,7 +79,7 @@ module Zold
       end
       modified = Merge.new(
         wallets: @wallets, remotes: @remotes, copies: copies.root, log: @log
-      ).run(['merge', id.to_s, '--no-baseline'])
+      ).run(['merge', id.to_s])
       Clean.new(wallets: @wallets, copies: copies.root, log: @log).run(['clean', id.to_s])
       copies.remove(localhost, Remotes::PORT)
       if modified.empty?

data/lib/zold/patch.rb

@@ -44,22 +44,24 @@ module Zold
       "#{@txns.count} txns"
     end
 
+    # Add legacy transactions first, since they are negative and can't
+    # be deleted ever. This method is called by merge.rb in order to add
+    # legacy negative transactions to the patch before everything else. They
+    # are not supposed to be disputed, ever.
+    def legacy(wallet, hours: 24)
+      raise 'You can\'t add legacy to a non-empty patch' unless @id.nil?
+      wallet.txns.each do |txn|
+        @txns << txn if txn.amount.negative? && txn.date < Time.now - hours * 60 * 60
+      end
+    end
+
     # Joins a new wallet on top of existing patch. An attempt is made to
     # copy as many transactions from the newcoming wallet to the existing
     # set of transactions, avoiding mistakes and duplicates.
-    #
-    # If +baseline+ is set to TRUE the provided wallet is considered to be
-    # the baseline and all transactions will be blindly trusted.
-    def join(wallet, baseline: true, legacy: false)
+    def join(wallet)
       if @id.nil?
         @id = wallet.id
         @key = wallet.key
-        if baseline
-          @txns = wallet.txns
-          @log.debug("The baseline of #{wallet.id} is #{wallet.balance}/#{@txns.count}t")
-        else
-          @log.debug("The baseline of #{@txns.count} transactions ignored")
-        end
         @network = wallet.network
       end
       unless wallet.network == @network
@@ -75,7 +77,6 @@ module Zold
         return
       end
       wallet.txns.each do |txn|
-        next if legacy && (txn.amount.positive? || txn.date > Time.now - 24 * 60 * 60)
         next if @txns.find { |t| t == txn }
         if txn.amount.negative?
           dup = @txns.find { |t| t.id == txn.id && t.amount.negative? }
@@ -115,16 +116,15 @@ with a new one \"#{txn.to_text}\" from #{wallet.mnemo}")
                 @log.error("Paying wallet #{txn.bnf} file is absent even after PULL: \"#{txn.to_text}\"")
                 next
               end
+              unless @wallets.acq(txn.bnf) { |p| p.includes_negative?(txn.id, wallet.id) }
+                @log.error("The beneficiary #{@wallets.acq(txn.bnf, &:mnemo)} of #{@id} \
+doesn't have this transaction: \"#{txn.to_text}\"")
+                next
+              end
             else
-              @log.error("Paying wallet #{txn.bnf} file is absent and it's a \"shallow\" MERGE: #{txn.to_text}")
-              next
+              @log.debug("Paying wallet #{txn.bnf} file is absent but it's a \"shallow\" MERGE: #{txn.to_text}")
             end
           end
-          unless @wallets.acq(txn.bnf) { |p| p.includes_negative?(txn.id, wallet.id) }
-            @log.error("The beneficiary #{@wallets.acq(txn.bnf, &:mnemo)} of #{@id} \
-doesn't have this transaction: \"#{txn.to_text}\"")
-            next
-          end
         end
         @txns << txn
         @log.debug("Merged on top, balance is #{@txns.map(&:amount).inject(&:+)}: #{txn.to_text}")

data/lib/zold/version.rb

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

data/test/commands/test_merge.rb

@@ -25,6 +25,7 @@ require 'tmpdir'
 require 'time'
 require 'webmock/minitest'
 require 'zold/score'
+require 'English'
 require_relative '../test__helper'
 require_relative '../fake_home'
 require_relative '../../lib/zold/wallet'
@@ -131,15 +132,16 @@ class TestMerge < Zold::Test
       key = Zold::Key.new(file: 'fixtures/id_rsa')
       wallet.sub(Zold::Amount.new(zld: 9.99), "NOPREFIX@#{Zold::Id.new}", key)
       Zold::Merge.new(wallets: home.wallets, remotes: home.remotes, copies: home.copies.root, log: test_log).run(
-        ['merge', wallet.id.to_s, '--no-baseline']
+        ['merge', wallet.id.to_s]
       )
       assert_equal(Zold::Amount::ZERO, wallet.balance)
     end
   end
 
-  def test_merges_scenarios
-    base = 'fixtures/merge'
-    Dir.new(base).select { |f| File.directory?(File.join(base, f)) && !f.start_with?('.') }.each do |f|
+  base = 'fixtures/merge'
+  Dir.new(base).select { |f| File.directory?(File.join(base, f)) && !f.start_with?('.') }.each do |f|
+    method = "test_#{f}"
+    define_method(method) do
       Dir.mktmpdir do |dir|
         FileUtils.cp_r(File.join('fixtures/merge', "#{f}/."), dir)
         scores = File.join(dir, "copies/0123456789abcdef/scores#{Zold::Copies::EXT}")
@@ -152,7 +154,6 @@ class TestMerge < Zold::Test
           %w[merge 0123456789abcdef --shallow]
         )
         Dir.chdir(dir) do
-          test_log.info("Testing #{f}...")
           require File.join(dir, 'assert.rb')
         end
       end

data/test/test_patch.rb

@@ -26,6 +26,7 @@ require_relative 'test__helper'
 require_relative '../lib/zold/key'
 require_relative '../lib/zold/id'
 require_relative '../lib/zold/wallet'
+require_relative '../lib/zold/prefixes'
 require_relative '../lib/zold/amount'
 require_relative '../lib/zold/patch'
 
@@ -52,8 +53,7 @@ class TestPatch < Zold::Test
       patch.join(first)
       patch.join(second)
       patch.join(third)
-      FileUtils.rm(first.path)
-      assert_equal(true, patch.save(first.path))
+      assert_equal(true, patch.save(first.path, overwrite: true))
       assert_equal(Zold::Amount.new(zld: -53.0), first.balance)
     end
   end
@@ -67,8 +67,8 @@ class TestPatch < Zold::Test
       patch = Zold::Patch.new(home.wallets, log: test_log)
       patch.join(first)
       patch.join(second)
-      FileUtils.rm(first.path)
-      assert_equal(true, patch.save(first.path))
+      assert_equal(false, patch.save(first.path, overwrite: true))
+      first.flush
       assert_equal(Zold::Amount::ZERO, first.balance)
     end
   end
@@ -84,8 +84,8 @@ class TestPatch < Zold::Test
       patch = Zold::Patch.new(home.wallets, log: test_log)
       patch.join(first)
       patch.join(second)
-      FileUtils.rm(first.path)
-      assert_equal(true, patch.save(first.path))
+      assert_equal(true, patch.save(first.path, overwrite: true))
+      first.flush
       assert_equal(amount * -1, first.balance)
     end
   end
@@ -97,13 +97,18 @@ class TestPatch < Zold::Test
       IO.write(second.path, IO.read(first.path))
       key = Zold::Key.new(file: 'fixtures/id_rsa')
       second.sub(Zold::Amount.new(zld: 7.0), "NOPREFIX@#{Zold::Id.new}", key)
-      first.add(Zold::Txn.new(1, Time.now, Zold::Amount.new(zld: 9.0), 'NOPREFIX', Zold::Id.new, 'fake'))
+      first.add(
+        Zold::Txn.new(
+          1, Time.now, Zold::Amount.new(zld: 9.0),
+          Zold::Prefixes.new(first).create, Zold::Id.new, 'fake'
+        )
+      )
       patch = Zold::Patch.new(home.wallets, log: test_log)
       patch.join(first)
       patch.join(second)
-      FileUtils.rm(first.path)
-      assert_equal(true, patch.save(first.path))
-      assert_equal(Zold::Amount.new(zld: 2.0), first.balance)
+      assert_equal(true, patch.save(first.path, overwrite: true))
+      first.flush
+      assert_equal(Zold::Amount.new(zld: 2.0).to_s, first.balance.to_s)
     end
   end
 
@@ -135,9 +140,10 @@ class TestPatch < Zold::Test
       patch = Zold::Patch.new(home.wallets, log: test_log)
       patch.join(first)
       patch.join(second)
-      FileUtils.rm(first.path)
-      assert_equal(true, patch.save(first.path))
-      assert_equal(Zold::Amount.new(zld: -6.0), first.balance)
+      assert_equal(true, patch.save(first.path, overwrite: true))
+      first.flush
+      assert_equal(3, first.txns.count)
+      assert_equal(Zold::Amount.new(zld: -6.0).to_s, first.balance.to_s)
     end
   end
 end

data/upgrades/rename_foreign_wallets.rb

@@ -39,7 +39,7 @@ module Zold
         f = File.join(@home, path)
         wallet = Wallet.new(f)
         next if wallet.network == @network
-        @log.info("Wallet #{wallet.id} #{Rainbow(renamed).red}, \
+        @log.info("Wallet #{wallet.id} #{Rainbow('renamed').red}, \
 since it's in \"#{wallet.network}\", while we are in \"#{@network}\" network")
         File.rename(f, f + '-old')
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.22.6
+  version: 0.22.7
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -574,6 +574,10 @@ files:
 - fixtures/merge/into-no-wallet/assert.rb
 - fixtures/merge/into-no-wallet/copies/0123456789abcdef/1.zc
 - fixtures/merge/into-no-wallet/copies/0123456789abcdef/scores.zc
+- fixtures/merge/legacy-negatives-stay/0123456789abcdef.z
+- fixtures/merge/legacy-negatives-stay/assert.rb
+- fixtures/merge/legacy-negatives-stay/copies/0123456789abcdef/1.zc
+- fixtures/merge/legacy-negatives-stay/copies/0123456789abcdef/scores.zc
 - fixtures/merge/random-expenses/0000000000000000.z
 - fixtures/merge/random-expenses/0123456789abcdef.z
 - fixtures/merge/random-expenses/assert.rb
@@ -747,7 +751,7 @@ licenses:
 - MIT
 metadata: {}
 post_install_message: |-
-  Thanks for installing Zold 0.22.6!
+  Thanks for installing Zold 0.22.7!
     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