zold 0.23.11 → 0.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5849ac3bfc78f34607a15fa94739391b1d655f9c2870d1eb0de3fb9d2eaa2603
-  data.tar.gz: 345524d2e2202209dc7a8fcd64835b0168fe58c18035db7d8b208a638e332d88
+  metadata.gz: fede79d35bed10c7da7902883eeaca119b416034d9e39c3fae34a6cb33994ae2
+  data.tar.gz: e2f01c2f7fa5739164b98e541697822b629b92d749bf96aa6b26e5c94d8b49ea
 SHA512:
-  metadata.gz: b274dd3d8f5a7441ba06704e1d3b0baaa14f0b96ba431e163864a7e4652b3f85267f763015b0569b51c0eeb2610cadf9a1ec980a8d08a1256a53ca42753251bf
-  data.tar.gz: 0e22e857b8a5aee8b06df59f1979bc33d7c740fb6ffd6ef920f587eea59a0e23c5ec04131bbc7cb09fed31afb8bdf785fdc5e91f703f070cb4903d5cfa45d70c
+  metadata.gz: b05c9c74665361bc4ca45bb0259f048fa88f69693470cecf9195f8cbbfbe68afa2eece977a714b5f39ab1bdd749649b96b42c6c3bf16544be3659deeef430f9e
+  data.tar.gz: aa6a7d2415c2b0dff71153704253a9c84e62f6a952e8c92aabac753a9028f1978c2ef77824b102efcd542a1662e298282c435c86199e611448f5bdbe975bc822

data/lib/zold/commands/merge.rb

@@ -62,6 +62,9 @@ Available options:"
         o.bool '--shallow',
           'Don\'t try to pull other wallets if their confirmations are required',
           default: false
+        o.string '--ledger',
+          'The name of the file where all new negative transactions will be recorded (default: /dev/null)',
+          default: '/dev/null'
         o.string '--network',
           'The name of the network we work in',
           default: 'test'
@@ -128,12 +131,12 @@ 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) do |txn|
+        patch.join(wallet, ledger: opts['ledger']) 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 |txn|
+        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']
           )

data/lib/zold/commands/node.rb

@@ -258,6 +258,8 @@ the node won\'t connect to the network like that; try to do "zold remote reset"
       Front.set(:copies, @copies)
       Front.set(:address, address)
       Front.set(:root, home)
+      ledger = File.join(home, 'ledger.csv')
+      Front.set(:ledger, ledger)
       Front.set(:opts, opts)
       Front.set(:dump_errors, opts['dump-errors'])
       Front.set(:port, opts['bind-port'])
@@ -270,6 +272,7 @@ the node won\'t connect to the network like that; try to do "zold remote reset"
                 SyncEntrance.new(
                   Entrance.new(
                     wts, @remotes, @copies, address,
+                    ledger: ledger,
                     log: @log, network: opts['network']
                   ),
                   File.join(home, '.zoldata/sync-entrance'),

data/lib/zold/commands/remote.rb

@@ -74,12 +74,12 @@ Available commands:
     #{Rainbow('remote trim').green}
       Remove the least reliable nodes
     #{Rainbow('remote select [options]').green}
-      Select the most reliable N nodes.
+      Select the most reliable N nodes
     #{Rainbow('remote update').green}
       Check each registered remote node for availability
 Available options:"
         o.integer '--tolerate',
-          'Maximum level of errors we are able to tolerate',
+          "Maximum level of errors we are able to tolerate (default: #{Remotes::TOLERANCE})",
           default: Remotes::TOLERANCE
         o.bool '--ignore-score-weakness',
           'Don\'t complain when their score is too weak',
@@ -115,10 +115,10 @@ Available options:"
           'Don\'t fail if ping fails, just report the problem in the log',
           default: false
         o.integer '--depth',
-          'The amount of update cycles to run, in order to fetch as many nodes as possible (default: 2)',
+          'The amount of update cycles to run, in order to fetch as many nodes as possible (default: 3)',
           default: 3
         o.string '--network',
-          "The name of the network we work in (default: #{Wallet::MAINET}",
+          "The name of the network we work in (default: #{Wallet::MAINET})",
           required: true,
           default: Wallet::MAINET
         o.bool '--reboot',
@@ -134,7 +134,7 @@ Available options:"
         #  - Remove note from the --max-nodes option saying that it applies to the select
         #  subcommand only.
         o.integer '--max-nodes',
-          "This applies only to the select subcommand. Number of nodes to limit to. Defaults to #{Remotes::MAX_NODES}.",
+          "Number of nodes to limit to (default: #{Remotes::MAX_NODES})",
           default: Remotes::MAX_NODES
         o.bool '--help', 'Print instructions'
       end

data/lib/zold/node/entrance.rb

@@ -39,7 +39,8 @@ require_relative '../commands/push'
 module Zold
   # The entrance
   class Entrance
-    def initialize(wallets, remotes, copies, address, log: Log::NULL, network: 'test')
+    def initialize(wallets, remotes, copies, address, ledger: '/dev/null',
+      log: Log::NULL, network: 'test')
       @wallets = wallets
       @remotes = remotes
       @copies = copies
@@ -49,6 +50,7 @@ module Zold
       @history = []
       @speed = []
       @mutex = Mutex.new
+      @ledger = ledger
     end
 
     def start
@@ -60,7 +62,8 @@ module Zold
       {
         'history': @history.join(', '),
         'history_size': @history.count,
-        'speed': @speed.empty? ? 0 : (@speed.inject(&:+) / @speed.count)
+        'speed': @speed.empty? ? 0 : (@speed.inject(&:+) / @speed.count),
+        'ledger': File.exist?(@ledger) ? IO.read(@ledger).split("\n").count : 0
       }
     end
 
@@ -78,9 +81,7 @@ module Zold
           wallets: @wallets, remotes: @remotes, copies: copies.root, log: @log
         ).run(['fetch', id.to_s, "--ignore-node=#{@address}", "--network=#{@network}", '--quiet-if-absent'])
       end
-      modified = Merge.new(
-        wallets: @wallets, remotes: @remotes, copies: copies.root, log: @log
-      ).run(['merge', id.to_s])
+      modified = merge(id, copies)
       Clean.new(wallets: @wallets, copies: copies.root, log: @log).run(['clean', id.to_s])
       copies.remove(localhost, Remotes::PORT)
       modified += Rebase.new(wallets: @wallets, log: @log).run(['rebase', id.to_s])
@@ -100,5 +101,27 @@ module Zold
       end
       modified
     end
+
+    def merge(id, copies)
+      Tempfile.open do |f|
+        modified = Merge.new(
+          wallets: @wallets, remotes: @remotes, copies: copies.root, log: @log
+        ).run(['merge', id.to_s, "--ledger=#{f.path}"])
+        @mutex.synchronize do
+          txns = File.exist?(@ledger) ? IO.read(@ledger).strip.split("\n") : []
+          txns += IO.read(f.path).strip.split("\n")
+          IO.write(
+            @ledger,
+            txns.map { |t| t.split(';') }
+              .uniq { |t| "#{t[1]}-#{t[3]}" }
+              .reject { |t| Txn.parse_time(t[0]) < Time.now - 24 * 60 * 60 }
+              .map { |t| t.join(';') }
+              .join("\n")
+              .strip
+          )
+        end
+        modified
+      end
+    end
   end
 end

data/lib/zold/node/front.rb

@@ -62,6 +62,7 @@ module Zold
       set :server, :thin
       set :opts, nil # to be injected at node.rb
       set :log, nil # to be injected at node.rb
+      set :ledger, nil # to be injected at node.rb
       set :trace, nil # to be injected at node.rb
       set :dump_errors, false # to be injected at node.rb
       set :protocol, PROTOCOL # to be injected at node.rb
@@ -384,6 +385,30 @@ this is not a normal behavior, you may want to report a bug to our GitHub reposi
       )
     end
 
+    get '/ledger' do
+      content_type('text/plain')
+      File.exist?(settings.ledger) ? IO.read(settings.ledger) : ''
+    end
+
+    get '/ledger.json' do
+      content_type('application/json')
+      pretty(
+        (File.exist?(settings.ledger) ? IO.read(settings.ledger).split("\n") : []).map do |t|
+          parts = t.split(';')
+          {
+            found: parts[0],
+            id: parts[1].to_i,
+            date: parts[2],
+            source: parts[3],
+            target: parts[4],
+            amount: parts[5],
+            prefix: parts[6],
+            details: parts[7]
+          }
+        end
+      )
+    end
+
     get '/farm' do
       content_type('text/plain')
       settings.farm.to_text

data/lib/zold/patch.rb

@@ -58,7 +58,7 @@ module Zold
     # 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.
-    def join(wallet)
+    def join(wallet, ledger: '/dev/null')
       if @id.nil?
         @id = wallet.id
         @key = wallet.key
@@ -122,6 +122,22 @@ doesn't have this transaction: \"#{txn.to_text}\"")
           end
         end
         @txns << txn
+        if txn.amount.negative?
+          File.open(ledger, 'a') do |f|
+            f.puts(
+              [
+                Time.now.utc.iso8601,
+                txn.id,
+                txn.date.utc.iso8601,
+                wallet.id,
+                txn.bnf,
+                txn.amount.to_i * -1,
+                txn.prefix,
+                txn.details
+              ].map(&:to_s).join(';') + "\n"
+            )
+          end
+        end
         @log.debug("Merged on top, balance is #{@txns.map(&:amount).inject(&:+)}: #{txn.to_text}")
       end
     end

data/lib/zold/remotes.rb

@@ -79,8 +79,8 @@ module Zold
       msg = response.status_line.strip
       return if response.status.to_i == code
       if response.headers && response.headers['X-Zold-Error']
-        raise CantAssert, "Error ##{response.status} \"#{response.headers['X-Zold-Error']}\"
-            at #{response.headers['X-Zold-Path']}"
+        raise CantAssert, "Error ##{response.status} \"#{response.headers['X-Zold-Error']}\" \
+at #{response.headers['X-Zold-Path']}"
       end
       raise CantAssert, "Unexpected HTTP code #{response.status}, instead of #{code}" if msg.empty?
       raise CantAssert, "#{msg} (HTTP code #{response.status}, instead of #{code})"

data/lib/zold/txn.rb

@@ -71,7 +71,7 @@ module Zold
       @id = id
       raise 'The time can\'t be NIL' if date.nil?
       raise 'Time have to be of type Time' unless date.is_a?(Time)
-      raise "Time can't be in the future: #{date}" if date > Time.now
+      raise "Time can't be in the future: #{date.utc.iso8601}" if date > Time.now
       @date = date
       raise 'The amount can\'t be NIL' if amount.nil?
       raise 'The amount has to be of type Amount' unless amount.is_a?(Amount)

data/lib/zold/version.rb

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

data/test/node/test_entrance.rb

@@ -53,13 +53,15 @@ class TestEntrance < Zold::Test
     FakeHome.new(log: test_log).run do |home|
       source = home.create_wallet(sid)
       target = home.create_wallet(tid)
-      e = Zold::Entrance.new(home.wallets, home.remotes, home.copies(source).root, 'x', log: test_log)
+      ledger = File.join(home.dir, 'ledger.csv')
+      e = Zold::Entrance.new(home.wallets, home.remotes, home.copies(source).root, 'x', ledger: ledger, log: test_log)
       modified = e.push(source.id, body)
       assert_equal(3, modified.count)
       assert_equal(Zold::Amount.new(zld: -19.99), source.balance)
       assert_equal(Zold::Amount.new(zld: 19.99), target.balance)
       assert(modified.include?(sid))
       assert(modified.include?(tid))
+      assert_equal(1, IO.read(ledger).split("\n").count)
     end
   end
 

data/test/node/test_front.rb

@@ -82,6 +82,8 @@ class FrontTest < Zold::Test
           '/version',
           '/protocol',
           '/farm',
+          '/ledger',
+          '/ledger.json',
           '/metronome',
           '/score',
           '/trace',

data/test/test_patch.rb

@@ -146,4 +146,33 @@ class TestPatch < Zold::Test
       assert_equal(Zold::Amount.new(zld: -6.0).to_s, first.balance.to_s)
     end
   end
+
+  def test_protocols_new_txns
+    FakeHome.new(log: test_log).run do |home|
+      first = home.create_wallet(Zold::Id::ROOT)
+      second = home.create_wallet
+      IO.write(second.path, IO.read(first.path))
+      amount = Zold::Amount.new(zld: 333.0)
+      key = Zold::Key.new(file: 'fixtures/id_rsa')
+      target = Zold::Id.new
+      second.sub(amount, "NOPREFIX@#{target}", key, 'some details')
+      second.sub(amount * 2, "NOPREFIX@#{target}", key)
+      patch = Zold::Patch.new(home.wallets, log: test_log)
+      patch.legacy(first)
+      Tempfile.open do |f|
+        patch.join(second, ledger: f.path) { false }
+        lines = IO.read(f).split("\n")
+        assert_equal(2, lines.count)
+        parts = lines[0].split(';')
+        assert(!Zold::Txn.parse_time(parts[0]).nil?)
+        assert_equal(1, parts[1].to_i)
+        assert(!Zold::Txn.parse_time(parts[2]).nil?)
+        assert_equal(Zold::Id::ROOT.to_s, parts[3])
+        assert_equal(target.to_s, parts[4])
+        assert_equal(amount, Zold::Amount.new(zents: parts[5].to_i))
+        assert_equal('NOPREFIX', parts[6])
+        assert_equal('some details', parts[7])
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.23.11
+  version: 0.24.0
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-18 00:00:00.000000000 Z
+date: 2019-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace
@@ -753,7 +753,7 @@ licenses:
 - MIT
 metadata: {}
 post_install_message: |-
-  Thanks for installing Zold 0.23.11!
+  Thanks for installing Zold 0.24.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