zold 0.22.9 → 0.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42d10a8522bef20fb7b2c55c247ecc7e5880ff8b54f3de789757a66f93ae5473
-  data.tar.gz: 36961cafd7fb37eb88790efca940a8181b9ec57c42808bbb8b6a3d6766b70c44
+  metadata.gz: 95430a239fd73f041ab0fcff000ce6406b7d0ff89e4dc4b66b63c6aaa525967e
+  data.tar.gz: 592bf1dd34b5fbe895033565dd481b01cd4da65d4f92145f17008f8bbbac43f6
 SHA512:
-  metadata.gz: 44792c5bec30388fd5cbaf793ab5a7ac6254aaf6e52ff2ee0574fb2d158144fc832e63bcd1c91bc349b3403e0931dc6b8db717570e4fd6ebd61be324e2574750
-  data.tar.gz: c87eabcbd062862ef4538a50c1e4eb3da11e82bcbacb703e935e76ef3647934156f6e3d53f08171b1a753b2f953eb19ee243293d15b0cd44bdd9930714e37209
+  metadata.gz: 664086b5fac5d2ba9fc29fe4b31e5b6a3d542c6a314e9ec91cefeed825460b703bf8f85710e7104fb34ad9ea401b9c2d10fe46d80cfc4b7672f3c584590841b3
+  data.tar.gz: bcf469f972e7f2e2c960e19992a3c6d2fe098b2e1884d46bf5ffceb584c32559942a5c3aec42e0b0f5460cbd3afa83f824c2ca60b25d5d570d130d879fa70949

data/bin/zold

@@ -81,6 +81,8 @@ Available commands:
     Remove expired local copies
   #{Rainbow('merge').green} [ID...] [options]
     Merge remote copies with the HEAD
+  #{Rainbow('rebase').green} [ID...] [options]
+    Rebase local copy of the wallet, removing all inconsistencies
   #{Rainbow('propagate').green} [ID...] [options]
     Propagate transactions to receiving wallets
   #{Rainbow('pull').green} [ID...] [options]
@@ -237,6 +239,9 @@ cmd = lambda do
     when 'merge'
       require_relative '../lib/zold/commands/merge'
       Zold::Merge.new(wallets: wallets, remotes: remotes, copies: copies, log: log).run(args)
+    when 'merge'
+      require_relative '../lib/zold/commands/rebase'
+      Zold::Rebase.new(wallets: wallets, log: log).run(args)
     when 'propagate'
       require_relative '../lib/zold/commands/propagate'
       Zold::Propagate.new(wallets: wallets, log: log).run(args)

data/lib/zold/commands/fetch.rb

@@ -56,6 +56,9 @@ module Zold
     # Raises when there are not enough successful nodes.
     class NoQuorum < StandardError; end
 
+    # Raises when the wallet wasn't found in all visible nodes.
+    class NotFound < StandardError; end
+
     def initialize(wallets:, remotes:, copies:, log: Log::NULL)
       @wallets = wallets
       @remotes = remotes
@@ -117,7 +120,8 @@ Available options:"
       end
       unless opts['quiet-if-absent']
         if done.value.zero?
-          raise "No nodes out of #{nodes.value} have the wallet #{id}; run 'zold remote update' and try again"
+          raise NotFound, "No nodes out of #{nodes.value} have the wallet #{id}; \
+run 'zold remote update' and try again"
         end
         if masters.value.zero? && !opts['tolerate-edges']
           raise EdgesOnly, "There are only edge nodes, run 'zold remote update' or use --tolerate-edges"

data/lib/zold/commands/merge.rb

@@ -37,7 +37,7 @@ require_relative '../patch'
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 module Zold
-  # MERGE pulling command
+  # MERGE command
   class Merge
     prepend ThreadBadge
 
@@ -128,12 +128,16 @@ into #{@wallets.acq(id, &:mnemo)} in #{Age.new(start, limit: 0.1 + cps.count * 0
       start = Time.now
       @log.debug("Building a patch for #{wallet.id} from remote copy ##{name} with #{wallet.mnemo}...")
       if opts['shallow']
-        patch.join(wallet)
+        patch.join(wallet) do |txn|
+          @log.debug("Paying wallet #{txn.bnf} file is absent but it's a \"shallow\" MERGE: #{txn.to_text}")
+          false
+        end
       else
-        patch.join(wallet) do |id|
+        patch.join(wallet) do |txn|
           Pull.new(wallets: @wallets, remotes: @remotes, copies: @copies, log: @log).run(
-            ['pull', id.to_s, "--network=#{opts['network']}", '--shallow']
+            ['pull', txn.bnf.to_s, "--network=#{opts['network']}", '--shallow']
           )
+          true
         end
       end
       @log.debug("Copy ##{name} of #{wallet.id} merged in #{Age.new(start)}: #{patch}")

data/lib/zold/commands/rebase.rb

@@ -0,0 +1,76 @@
+# 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 'slop'
+require 'rainbow'
+require 'backtrace'
+require_relative 'thread_badge'
+require_relative 'args'
+require_relative '../age'
+require_relative '../log'
+require_relative '../id'
+require_relative '../wallet'
+require_relative '../patch'
+
+# REBASE command.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2018 Yegor Bugayenko
+# License:: MIT
+module Zold
+  # REBASE command
+  class Rebase
+    prepend ThreadBadge
+
+    def initialize(wallets:, log: Log::NULL)
+      @wallets = wallets
+      @log = log
+    end
+
+    # Returns the array of modified wallets (IDs)
+    def run(args = [])
+      opts = Slop.parse(args, help: true, suppress_errors: true) do |o|
+        o.banner = "Usage: zold rebase [ID...] [options]
+Available options:"
+        o.bool '--help', 'Print instructions'
+      end
+      mine = Args.new(opts, @log).take || return
+      list = mine.empty? ? @wallets.all : mine.map { |i| Id.new(i) }
+      list.uniq.each do |id|
+        rebase(id, opts)
+      end
+    end
+
+    private
+
+    def rebase(id, _)
+      start = Time.now
+      patch = Patch.new(@wallets, log: @log)
+      @wallets.acq(id) do |wallet|
+        patch.join(wallet) do |txn|
+          @log.debug("Paying wallet #{txn.bnf} file is absent: #{txn.to_text}")
+          false
+        end
+        @log.debug("Wallet #{wallet.mnemo} rebased in #{Age.new(start)}")
+      end
+    end
+  end
+end

data/lib/zold/node/entrance.rb

@@ -28,6 +28,7 @@ require_relative '../tax'
 require_relative '../age'
 require_relative '../commands/clean'
 require_relative '../commands/merge'
+require_relative '../commands/rebase'
 require_relative '../commands/fetch'
 require_relative '../commands/push'
 
@@ -86,6 +87,7 @@ module Zold
         @log.info("Accepted #{id} in #{Age.new(start, limit: 1)} and not modified anything")
       else
         @log.info("Accepted #{id} in #{Age.new(start, limit: 1)} and modified #{modified.join(', ')}")
+        Rebase.new(wallets: @wallets, log: @log).run(['rebase'] + modified.map(&:to_s))
       end
       sec = (Time.now - start).round(2)
       @mutex.synchronize do

data/lib/zold/patch.rb

@@ -109,20 +109,15 @@ with a new one \"#{txn.to_text}\" from #{wallet.mnemo}")
             @log.error("Payment prefix '#{txn.prefix}' doesn't match with the key of #{wallet.id}: \"#{txn.to_text}\"")
             next
           end
-          unless @wallets.acq(txn.bnf, &:exists?)
-            if block_given?
-              yield(txn.bnf)
-              unless @wallets.acq(txn.bnf, &:exists?)
-                @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} \
+          if !@wallets.acq(txn.bnf, &:exists?) && yield(txn)
+            unless @wallets.acq(txn.bnf, &:exists?)
+              @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.debug("Paying wallet #{txn.bnf} file is absent but it's a \"shallow\" MERGE: #{txn.to_text}")
+              next
             end
           end
         end

data/lib/zold/version.rb

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

data/test/commands/test_rebase.rb

@@ -0,0 +1,43 @@
+# 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 'minitest/autorun'
+require 'tmpdir'
+require_relative '../test__helper'
+require_relative '../fake_home'
+require_relative '../../lib/zold/commands/rebase'
+
+# REBASE test.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2018 Yegor Bugayenko
+# License:: MIT
+class TestRebase < Zold::Test
+  def test_rebases_wallet
+    FakeHome.new(log: test_log).run do |home|
+      wallet = home.create_wallet
+      Zold::Rebase.new(wallets: home.wallets, log: test_log).run(
+        ['rebase', wallet.id.to_s]
+      )
+      assert_equal(0, wallet.txns.count)
+    end
+  end
+end

data/test/test_patch.rb

@@ -50,9 +50,9 @@ class TestPatch < Zold::Test
       t = third.sub(Zold::Amount.new(zld: 10.0), "NOPREFIX@#{Zold::Id.new}", key)
       third.add(t.inverse(Zold::Id.new))
       patch = Zold::Patch.new(home.wallets, log: test_log)
-      patch.join(first)
-      patch.join(second)
-      patch.join(third)
+      patch.join(first) { false }
+      patch.join(second) { false }
+      patch.join(third) { false }
       assert_equal(true, patch.save(first.path, overwrite: true))
       assert_equal(Zold::Amount.new(zld: -53.0), first.balance)
     end
@@ -65,8 +65,8 @@ class TestPatch < Zold::Test
       IO.write(second.path, IO.read(first.path))
       second.add(Zold::Txn.new(1, Time.now, Zold::Amount.new(zld: 11.0), 'NOPREFIX', Zold::Id.new, 'fake'))
       patch = Zold::Patch.new(home.wallets, log: test_log)
-      patch.join(first)
-      patch.join(second)
+      patch.join(first) { false }
+      patch.join(second) { false }
       assert_equal(false, patch.save(first.path, overwrite: true))
       first.flush
       assert_equal(Zold::Amount::ZERO, first.balance)
@@ -82,8 +82,8 @@ class TestPatch < Zold::Test
       key = Zold::Key.new(file: 'fixtures/id_rsa')
       second.sub(amount, "NOPREFIX@#{Zold::Id.new}", key)
       patch = Zold::Patch.new(home.wallets, log: test_log)
-      patch.join(first)
-      patch.join(second)
+      patch.join(first) { false }
+      patch.join(second) { false }
       assert_equal(true, patch.save(first.path, overwrite: true))
       first.flush
       assert_equal(amount * -1, first.balance)
@@ -104,8 +104,8 @@ class TestPatch < Zold::Test
         )
       )
       patch = Zold::Patch.new(home.wallets, log: test_log)
-      patch.join(first)
-      patch.join(second)
+      patch.join(first) { false }
+      patch.join(second) { false }
       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)
@@ -138,8 +138,8 @@ class TestPatch < Zold::Test
         ).signed(key, first.id)
       )
       patch = Zold::Patch.new(home.wallets, log: test_log)
-      patch.join(first)
-      patch.join(second)
+      patch.join(first) { false }
+      patch.join(second) { false }
       assert_equal(true, patch.save(first.path, overwrite: true))
       first.flush
       assert_equal(3, first.txns.count)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.22.9
+  version: 0.23.0
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-10 00:00:00.000000000 Z
+date: 2019-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace
@@ -620,6 +620,7 @@ files:
 - lib/zold/commands/propagate.rb
 - lib/zold/commands/pull.rb
 - lib/zold/commands/push.rb
+- lib/zold/commands/rebase.rb
 - lib/zold/commands/remote.rb
 - lib/zold/commands/remove.rb
 - lib/zold/commands/routines/audit.rb
@@ -690,6 +691,7 @@ files:
 - test/commands/test_propagate.rb
 - test/commands/test_pull.rb
 - test/commands/test_push.rb
+- test/commands/test_rebase.rb
 - test/commands/test_remote.rb
 - test/commands/test_remove.rb
 - test/commands/test_show.rb
@@ -751,7 +753,7 @@ licenses:
 - MIT
 metadata: {}
 post_install_message: |-
-  Thanks for installing Zold 0.22.9!
+  Thanks for installing Zold 0.23.0!
     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
@@ -799,6 +801,7 @@ test_files:
 - test/commands/test_propagate.rb
 - test/commands/test_pull.rb
 - test/commands/test_push.rb
+- test/commands/test_rebase.rb
 - test/commands/test_remote.rb
 - test/commands/test_remove.rb
 - test/commands/test_show.rb