zold 0.26.16 → 0.26.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b0ae546cf6416b998bfd75490dae5b662d89c3e6e598958f1c73c86e51fda17
-  data.tar.gz: bcc69294f383f7832b3ac832742c89630eb7d8a880741aefd7c0397a88cb9042
+  metadata.gz: a0649d6ccb04536eabe73074ef91e87317c15f35b64aea31739e8b82d4bb5347
+  data.tar.gz: 788a6dfd9cb3a6cc687f1abe29a9636d3d3245e7e745481fdab8ebe7c96de753
 SHA512:
-  metadata.gz: f746fba3dad2802bce2170facba75809d44fee26f29cf61a95c1c74245c61668f1fd75fed47722ab50bfc7676093b287b16e4e1683b280f99fd18715321e8574
-  data.tar.gz: fe15c859e3ff938901b7ef369e80346dc005be4451e4c2abd2cd45bd778b0b5b8939c3d0201ae78e4802c8d3aec6475779d94ab96a12857eec61e3e8d9476a7b
+  metadata.gz: dc2b1ad12503d024a5a31600186a7084b6def9d978fd4e531037f38d5d6e12160c2b47cd716adc89f02f474b4af52dd80e933666e07ed5b2f0d4062e28f5d0e4
+  data.tar.gz: f14755645f55d6d954c3bd38668d961ce6121399d6b2f1dc5b13b25ed596f9c4f1527fd75ecf06391401f713653a621a6114f135b216ae77b5d6352046cd2693

data/lib/zold/commands/diff.rb

@@ -20,11 +20,11 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-require_relative 'thread_badge'
 require 'tempfile'
 require 'slop'
 require 'diffy'
 require 'rainbow'
+require_relative 'thread_badge'
 require_relative 'args'
 require_relative '../log'
 require_relative '../patch'

data/lib/zold/commands/node.rb

@@ -45,7 +45,8 @@ require_relative '../node/async_entrance'
 require_relative '../node/sync_entrance'
 require_relative '../node/nodup_entrance'
 require_relative '../node/nospam_entrance'
-require_relative '../node/journaled_entrance'
+require_relative '../node/pipeline'
+require_relative '../node/journaled_pipeline'
 require_relative '../node/front'
 require_relative '../node/trace'
 require_relative '../node/farm'
@@ -271,25 +272,23 @@ the node won\'t connect to the network like that; try to do "zold remote reset"
       FileUtils.mkdir_p(journal_dir)
       Front.set(:journal_dir, journal_dir)
       Front.set(:node_alias, node_alias(opts, address))
-      jlog = Logger.new(File.join(journal_dir, 'journal'))
-      jlog.level = Logger::DEBUG
-      jlog.formatter = Log::COMPACT
       entrance = SafeEntrance.new(
         NoSpamEntrance.new(
           NoDupEntrance.new(
             AsyncEntrance.new(
               SpreadEntrance.new(
                 SyncEntrance.new(
-                  JournaledEntrance.new(
-                    Entrance.new(
-                      wts, @remotes, @copies, address,
-                      ledger: ledger,
-                      log: Log::Tee.new(@log, jlog), network: opts['network']
-                    ),
+                  Entrance.new(
                     wts,
-                    journal_dir,
-                    jlog,
-                    'journal'
+                    JournaledPipeline.new(
+                      Pipeline.new(
+                        @remotes, @copies, address,
+                        ledger: ledger,
+                        network: opts['network']
+                      ),
+                      journal_dir
+                    ),
+                    log: @log
                   ),
                   File.join(home, '.zoldata/sync-entrance'),
                   log: @log

data/lib/zold/hungry_wallets.rb

@@ -58,7 +58,7 @@ module Zold
           if @queue.size > 256
             @log.error("Hungry queue is full with #{@queue.size} wallets, can't add #{id}")
           elsif @missed.exists?(id.to_s)
-            @log.debug("Hungry queue has seen #{id} just #{Age.new(@missed.mtime(id.to_s))} ago
+            @log.debug("Hungry queue has seen #{id} just #{Age.new(@missed.mtime(id.to_s))} ago \
 (amoung #{@missed.size} others) and it was not found")
           else
             @mutex.synchronize do

data/lib/zold/node/entrance.rb

@@ -21,15 +21,8 @@
 # SOFTWARE.
 
 require 'tempfile'
+require 'time'
 require_relative '../log'
-require_relative '../remotes'
-require_relative '../copies'
-require_relative '../tax'
-require_relative '../age'
-require_relative '../commands/clean'
-require_relative '../commands/merge'
-require_relative '../commands/fetch'
-require_relative '../commands/push'
 
 # The entrance of the web front.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -38,18 +31,13 @@ require_relative '../commands/push'
 module Zold
   # The entrance
   class Entrance
-    def initialize(wallets, remotes, copies, address, ledger: '/dev/null',
-      log: Log::NULL, network: 'test')
+    def initialize(wallets, pipeline, log: Log::NULL)
       @wallets = wallets
-      @remotes = remotes
-      @copies = copies
-      @address = address
+      @pipeline = pipeline
       @log = log
-      @network = network
       @history = []
       @speed = []
       @mutex = Mutex.new
-      @ledger = ledger
     end
 
     def start
@@ -62,7 +50,7 @@ module Zold
         'history': @history.join(', '),
         'history_size': @history.count,
         'speed': @speed.empty? ? 0 : (@speed.inject(&:+) / @speed.count),
-        'ledger': File.exist?(@ledger) ? IO.read(@ledger).split("\n").count : 0
+        'pipeline': @pipeline.to_json
       }
     end
 
@@ -72,25 +60,7 @@ module Zold
       raise 'Id must be of type Id' unless id.is_a?(Id)
       raise 'Body can\'t be nil' if body.nil?
       start = Time.now
-      copies = Copies.new(File.join(@copies, id.to_s))
-      host = '0.0.0.0'
-      copies.add(body, host, Remotes::PORT, 0)
-      unless @remotes.all.empty?
-        Fetch.new(
-          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(id, copies)
-      Clean.new(wallets: @wallets, copies: copies.root, log: @log).run(
-        ['clean', id.to_s, '--max-age=1']
-      )
-      copies.remove(host, Remotes::PORT)
-      if modified.empty?
-        @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(', ')}")
-      end
-      modified << id if copies.all.count > 1
+      modified = @pipeline.push(id, body, @wallets, @log)
       sec = (Time.now - start).round(2)
       @mutex.synchronize do
         @history.shift if @history.length >= 16
@@ -102,27 +72,5 @@ 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}", "--network=#{@network}"])
-        @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

@@ -319,7 +319,7 @@ this is not a normal behavior, you may want to report a bug to our GitHub reposi
     end
 
     get %r{/wallet/(?<id>[A-Fa-f0-9]{16})\.html} do
-      fetch do |wallet|
+      fetch('text/html') do |wallet|
         [
           '<!DOCTYPE html><html><head>',
           '<title>' + wallet.id.to_s + '</title>',
@@ -338,8 +338,8 @@ this is not a normal behavior, you may want to report a bug to our GitHub reposi
               '<td style="color:' + (t.amount.negative? ? 'red' : 'green') + "\">#{t.id}</td>",
               "<td>#{t.date.utc.iso8601}</td>",
               '<td style="text-align:right">' + t.amount.to_zld(4) + '</td>',
-              "<td><a href='/wallet/#{t.bnf}.html'>#{t.bnf}</td>",
-              "<td>#{t.details}</td>",
+              "<td><a href='/wallet/#{t.bnf}.html'><code>#{t.bnf}</code></a></td>",
+              "<td>#{CGI.escapeHTML(t.details)}</td>",
               '</tr>'
             ].join
           end.join,
@@ -350,7 +350,7 @@ this is not a normal behavior, you may want to report a bug to our GitHub reposi
           "File size: #{Size.new(wallet.size)}/#{wallet.size}, \
 #{Copies.new(File.join(settings.copies, wallet.id)).all.count} copies<br/>",
           "Modified: #{wallet.mtime.utc.iso8601} (#{Age.new(wallet.mtime.utc.iso8601)} ago)<br/>",
-          "Digest: #{wallet.digest}</p></section></body></html>"
+          "Digest: <code>#{wallet.digest}</code></p></section></body></html>"
         ].join
       end
     end
@@ -488,7 +488,8 @@ this is not a normal behavior, you may want to report a bug to our GitHub reposi
         '<link href="https://cdn.jsdelivr.net/gh/yegor256/tacit@gh-pages/tacit-css-1.4.2.min.css" rel="stylesheet"/>',
         '</head><body><section>',
         DirItems.new(settings.journal_dir).fetch.sort.map do |f|
-          "<p><a href='/journal/item?id=#{f}'>#{f}</a></p>"
+          file = File.join(settings.journal_dir, f)
+          "<p><a href='/journal/item?id=#{f}'>#{f}</a>: #{File.size(file)} #{Age.new(File.mtime(file))} ago</p>"
         end.join,
         '</section></body></html>'
       ].join

data/lib/zold/node/{journaled_entrance.rb → journaled_pipeline.rb}

@@ -21,23 +21,18 @@
 # SOFTWARE.
 
 require 'tempfile'
+require 'diffy'
+require_relative 'pipeline'
 require_relative '../log'
-require_relative '../remotes'
-require_relative '../copies'
-require_relative '../tax'
 require_relative '../age'
-require_relative '../commands/clean'
-require_relative '../commands/merge'
-require_relative '../commands/fetch'
-require_relative '../commands/push'
 
-# The entrance with journals.
+# The pipeline with journals.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 module Zold
   # The entrance that keeps a journal for each wallet
-  class JournaledEntrance
+  class JournaledPipeline
     # Decorated wallets
     class Wallets < SimpleDelegator
       def initialize(wallets, log)
@@ -61,12 +56,9 @@ module Zold
       end
     end
 
-    def initialize(entrance, wallets, dir, log, journal)
-      @wallets = JournaledEntrance::Wallets.new(wallets, log)
-      @entrance = entrance
-      @dir = File.expand_path(dir)
-      @log = log
-      @journal = File.join(@dir, journal)
+    def initialize(pipeline, dir)
+      @pipeline = pipeline
+      @dir = dir
     end
 
     def start
@@ -76,21 +68,24 @@ module Zold
     end
 
     def to_json
-      @entrance.to_json.merge(
+      @pipeline.to_json.merge(
         'dir': @dir
       )
     end
 
     # Returns a list of modifed wallets (as Zold::Id)
-    def push(id, body)
+    def push(id, body, wallets, log)
       DirItems.new(@dir).fetch.each do |f|
         f = File.join(@dir, f)
         File.delete(f) if File.mtime(f) < Time.now - 24 * 60 * 60
       end
-      @log.info("push(#{id}, #{body.length} bytes)")
-      modified = @entrance.push(id, body)
-      IO.write(File.join(@dir, "#{Time.now.utc.iso8601.gsub(/[^0-9]/, '-')}-#{id}"), IO.read(@journal))
-      modified
+      journal = File.join(@dir, "#{Time.now.utc.iso8601.gsub(/[^0-9]/, '-')}-#{id}")
+      jlog = Logger.new(journal)
+      jlog.level = Logger::DEBUG
+      jlog.formatter = Log::COMPACT
+      tlog = Log::Tee.new(log, jlog)
+      tlog.info("push(#{id}, #{body.length} bytes)")
+      @pipeline.push(id, body, JournaledPipeline::Wallets.new(wallets, jlog), tlog)
     end
   end
 end

data/lib/zold/node/pipeline.rb

@@ -0,0 +1,108 @@
+# 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 'tempfile'
+require_relative '../log'
+require_relative '../remotes'
+require_relative '../copies'
+require_relative '../tax'
+require_relative '../age'
+require_relative '../commands/clean'
+require_relative '../commands/merge'
+require_relative '../commands/fetch'
+require_relative '../commands/push'
+
+# The pipeline that accepts new wallets and merges them.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2018 Yegor Bugayenko
+# License:: MIT
+module Zold
+  # The pipeline
+  class Pipeline
+    def initialize(remotes, copies, address, ledger: '/dev/null', network: 'test')
+      @remotes = remotes
+      @copies = copies
+      @address = address
+      @network = network
+      @history = []
+      @speed = []
+      @mutex = Mutex.new
+      @ledger = ledger
+    end
+
+    # Show its internals.
+    def to_json
+      {
+        'ledger': File.exist?(@ledger) ? IO.read(@ledger).split("\n").count : 0
+      }
+    end
+
+    # Returns a list of modifed wallets (as Zold::Id)
+    def push(id, body, wallets, log)
+      start = Time.now
+      copies = Copies.new(File.join(@copies, id.to_s))
+      host = '0.0.0.0'
+      copies.add(body, host, Remotes::PORT, 0)
+      unless @remotes.all.empty?
+        Fetch.new(
+          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(id, copies, wallets, log)
+      Clean.new(wallets: wallets, copies: copies.root, log: log).run(
+        ['clean', id.to_s, '--max-age=1']
+      )
+      copies.remove(host, Remotes::PORT)
+      if modified.empty?
+        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(', ')}")
+      end
+      modified << id if copies.all.count > 1
+      modified
+    end
+
+    private
+
+    def merge(id, copies, wallets, log)
+      Tempfile.open do |f|
+        modified = Merge.new(
+          wallets: wallets, remotes: @remotes, copies: copies.root, log: log
+        ).run(['merge', id.to_s, "--ledger=#{f.path}", "--network=#{@network}"])
+        @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/version.rb

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

data/test/node/test_entrance.rb

@@ -29,6 +29,7 @@ require_relative '../../lib/zold/remotes'
 require_relative '../../lib/zold/id'
 require_relative '../../lib/zold/key'
 require_relative '../../lib/zold/node/entrance'
+require_relative '../../lib/zold/node/pipeline'
 require_relative '../../lib/zold/commands/pay'
 
 # ENTRANCE test.
@@ -54,7 +55,11 @@ class TestEntrance < Zold::Test
       source = home.create_wallet(sid)
       target = home.create_wallet(tid)
       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)
+      e = Zold::Entrance.new(
+        home.wallets,
+        Zold::Pipeline.new(home.remotes, home.copies(source).root, 'x', ledger: ledger),
+        log: test_log
+      )
       modified = e.push(source.id, body)
       assert_equal(2, modified.count)
       assert_equal(Zold::Amount.new(zld: -19.99), source.balance)
@@ -68,7 +73,7 @@ class TestEntrance < Zold::Test
   def test_renders_json
     FakeHome.new(log: test_log).run do |home|
       wallet = home.create_wallet
-      e = Zold::Entrance.new(home.wallets, home.remotes, home.copies.root, 'x', log: test_log)
+      e = Zold::Entrance.new(home.wallets, Zold::Pipeline.new(home.remotes, home.copies.root, 'x'), log: test_log)
       e.push(wallet.id, IO.read(wallet.path))
       assert(e.to_json[:history].include?(wallet.id.to_s))
       assert(!e.to_json[:speed].negative?)

data/test/node/test_front.rb

@@ -139,7 +139,7 @@ class FrontTest < Zold::Test
   def test_increments_score
     FakeNode.new(log: test_log).run(opts('--threads=1')) do |port|
       3.times do |i|
-        assert_equal_wait(true) do
+        assert_equal_wait(true, max: 60) do
           response = Zold::Http.new(uri: "http://localhost:#{port}/").get
           assert_equal(200, response.status, response.body)
           score = Zold::Score.parse_json(Zold::JsonPage.new(response.body).to_hash['score'])

data/test/node/test_spread_entrance.rb

@@ -26,6 +26,7 @@ require_relative 'fake_node'
 require_relative '../test__helper'
 require_relative '../../lib/zold/id'
 require_relative '../../lib/zold/node/entrance'
+require_relative '../../lib/zold/node/pipeline'
 require_relative '../../lib/zold/node/spread_entrance'
 require_relative 'fake_entrance'
 
@@ -38,7 +39,11 @@ class TestSpreadEntrance < Zold::Test
     FakeHome.new(log: test_log).run do |home|
       wallet = home.create_wallet(Zold::Id.new)
       Zold::SpreadEntrance.new(
-        Zold::Entrance.new(home.wallets, home.remotes, home.copies(wallet).root, 'x', log: test_log),
+        Zold::Entrance.new(
+          home.wallets,
+          Zold::Pipeline.new(home.remotes, home.copies(wallet).root, 'x'),
+          log: test_log
+        ),
         home.wallets, home.remotes, 'x', log: test_log
       ).start do |e|
         assert_equal(0, e.to_json[:modified])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.26.16
+  version: 0.26.17
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -671,9 +671,10 @@ files:
 - lib/zold/node/farm.rb
 - lib/zold/node/farmers.rb
 - lib/zold/node/front.rb
-- lib/zold/node/journaled_entrance.rb
+- lib/zold/node/journaled_pipeline.rb
 - lib/zold/node/nodup_entrance.rb
 - lib/zold/node/nospam_entrance.rb
+- lib/zold/node/pipeline.rb
 - lib/zold/node/safe_entrance.rb
 - lib/zold/node/soft_error.rb
 - lib/zold/node/spread_entrance.rb
@@ -780,7 +781,7 @@ licenses:
 - MIT
 metadata: {}
 post_install_message: |-
-  Thanks for installing Zold 0.26.16!
+  Thanks for installing Zold 0.26.17!
     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