zold 0.26.17 → 0.26.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0649d6ccb04536eabe73074ef91e87317c15f35b64aea31739e8b82d4bb5347
-  data.tar.gz: 788a6dfd9cb3a6cc687f1abe29a9636d3d3245e7e745481fdab8ebe7c96de753
+  metadata.gz: 89109464b2af91b04867b407d157ad720d3f427f448c219d35fb582a50b11d26
+  data.tar.gz: 8b5ec196c38cb866499d6b8668f78103d2d420195269a6420d8ef1fa91677d69
 SHA512:
-  metadata.gz: dc2b1ad12503d024a5a31600186a7084b6def9d978fd4e531037f38d5d6e12160c2b47cd716adc89f02f474b4af52dd80e933666e07ed5b2f0d4062e28f5d0e4
-  data.tar.gz: f14755645f55d6d954c3bd38668d961ce6121399d6b2f1dc5b13b25ed596f9c4f1527fd75ecf06391401f713653a621a6114f135b216ae77b5d6352046cd2693
+  metadata.gz: 9af8dd404a6cde1f6bba43b3de2df8ad9716c4b7fba0d06adbf020a89f032a624686b6aacaf899bfbf740ed163da8ff1fb17193167e834ea2643ee9377398c3a
+  data.tar.gz: 2cd5d57d28b64bd71bcfd8fc81e8201a5a749d2b8b50f2c1af45a99f62b2d52f0236a16fdf38ed7dde06443fa42501eee004e93fc921e1ba6bbad3c1ceef314d

data/lib/zold/commands/merge.rb

@@ -65,6 +65,9 @@ Available options:"
         o.bool '--shallow',
           'Don\'t try to pull other wallets if their confirmations are required',
           default: false
+        o.bool '--deep',
+          'Try to pull other wallets if their confirmations are required, as deep as possible',
+          default: false
         o.bool '--allow-negative-balance',
           'Don\'t check for the negative balance of the wallet after the merge',
           default: false
@@ -143,13 +146,14 @@ into #{@wallets.acq(id, &:mnemo)} in #{Age.new(start, limit: 0.1 + cps.count * 0
       @log.debug("Building a patch for #{wallet.id} from remote copy ##{name} with #{wallet.mnemo}...")
       if opts['shallow']
         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}")
+          @log.debug("Paying wallet #{txn.bnf} file is in question but it's a \"shallow\" MERGE: #{txn.to_text}")
           false
         end
       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', '--quiet-if-absent']
+            ['pull', txn.bnf.to_s, "--network=#{opts['network']}", '--quiet-if-absent'] +
+            (opts['deep'] ? ['--deep'] : ['--shallow'])
           )
           true
         end

data/lib/zold/hungry_wallets.rb

@@ -82,6 +82,10 @@ module Zold
         sleep 0.2
         return
       end
+      if @remotes.all.empty?
+        @log.debug("Can't hungry-pull #{id}, the list of remotes is empty")
+        return
+      end
       begin
         Pull.new(wallets: @wallets, remotes: @remotes, copies: @copies, log: @log).run(
           ['pull', id.to_s, "--network=#{@network}", '--tolerate-edges', '--tolerate-quorum=1']

data/lib/zold/node/front.rb

@@ -24,6 +24,7 @@ STDOUT.sync = true
 
 require 'get_process_mem'
 require 'thin'
+require 'haml'
 require 'json'
 require 'sinatra/base'
 require 'concurrent'
@@ -54,6 +55,8 @@ module Zold
     MIN_SCORE = 4
 
     configure do
+      Haml::Options.defaults[:format] = :xhtml
+      set :views, (proc { File.expand_path(File.join(__dir__, '../../../views')) })
       Thread.current.name = 'sinatra'
       set :bind, '0.0.0.0'
       set :suppress_messages, true
@@ -93,7 +96,7 @@ module Zold
       Thread.current.thread_variable_set(:ip, request.ip)
       @start = Time.now
       if !settings.opts['halt-code'].empty? && params[:halt] && params[:halt] == settings.opts['halt-code']
-        settings.log.error('Halt signal received, shutting the front end down...')
+        settings.log.info('Halt signal received, shutting the front end down...')
         Front.stop!
       end
       check_header(Http::NETWORK_HEADER) do |header|
@@ -320,38 +323,15 @@ this is not a normal behavior, you may want to report a bug to our GitHub reposi
 
     get %r{/wallet/(?<id>[A-Fa-f0-9]{16})\.html} do
       fetch('text/html') do |wallet|
-        [
-          '<!DOCTYPE html><html><head>',
-          '<title>' + wallet.id.to_s + '</title>',
-          '<link href="https://cdn.jsdelivr.net/gh/yegor256/tacit@gh-pages/tacit-css-1.4.2.min.css" rel="stylesheet"/>',
-          '<style>table { width: 100%; } td, th { padding: 0.2em .4em }</style>',
-          '</head><body><section>',
-          "<p>#{wallet.network}<br/>",
-          "#{wallet.protocol}<br/>",
-          "#{wallet.id}<br/>",
-          "#{wallet.key.to_pub}</p>",
-          '<table><thead><tr><th>Id</th><th>Date</th><th>Amount</th><th>Wallet</th><th>Details</th></thead>',
-          '<tbody>',
-          wallet.txns.map do |t|
-            [
-              '<tr>',
-              '<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'><code>#{t.bnf}</code></a></td>",
-              "<td>#{CGI.escapeHTML(t.details)}</td>",
-              '</tr>'
-            ].join
-          end.join,
-          '<p>&mdash;<br/>',
-          "Balance: #{wallet.balance.to_zld(8)} ZLD (#{wallet.balance.to_i} zents)<br/>",
-          "Transactions: #{wallet.txns.count}<br/>",
-          "Taxes: #{Tax.new(wallet).paid} paid, the debt is #{Tax.new(wallet).debt}<br/>",
-          "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: <code>#{wallet.digest}</code></p></section></body></html>"
-        ].join
+        haml(
+          :wallet,
+          layout: :layout,
+          locals: {
+            title: wallet.id.to_s,
+            description: "Zold wallet #{wallet.id} at #{settings.address}",
+            wallet: wallet
+          }
+        )
       end
     end
 
@@ -482,17 +462,19 @@ this is not a normal behavior, you may want to report a bug to our GitHub reposi
 
     get '/journal' do
       content_type('text/html')
-      [
-        '<!DOCTYPE html><html><head>',
-        '<title>/journal</title>',
-        '<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|
-          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
+      haml(
+        :journal,
+        layout: :layout,
+        locals: {
+          title: '/journal',
+          description: 'The journal',
+          id: params[:id],
+          files: DirItems.new(settings.journal_dir).fetch.sort.reverse.select do |f|
+            !params[:id] || f.start_with?(params[:id])
+          end,
+          dir: settings.journal_dir
+        }
+      )
     end
 
     get '/journal/item' do

data/lib/zold/node/journaled_pipeline.rb

@@ -83,9 +83,10 @@ module Zold
       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)
+      jlog.info("push(#{id}, #{body.length} bytes): starting...")
+      modified = @pipeline.push(id, body, JournaledPipeline::Wallets.new(wallets, jlog), Log::Tee.new(log, jlog))
+      jlog.info("push(#{id}): done")
+      modified
     end
   end
 end

data/lib/zold/node/pipeline.rb

@@ -87,7 +87,7 @@ module Zold
       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}"])
+        ).run(['merge', id.to_s, "--ledger=#{f.path}", "--network=#{@network}", '--deep'])
         @mutex.synchronize do
           txns = File.exist?(@ledger) ? IO.read(@ledger).strip.split("\n") : []
           txns += IO.read(f.path).strip.split("\n")

data/lib/zold/version.rb

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

data/test/node/fake_node.rb

@@ -80,6 +80,7 @@ class FakeNode
         ensure
           Zold::Http.new(uri: uri + '?halt=test').get
           node.join
+          sleep 0.01 # stupid sleep to make sure all threads are terminated
         end
       end
     end

data/test/node/test_front.rb

@@ -149,22 +149,23 @@ class FrontTest < Zold::Test
     end
   end
 
-  def test_renders_wallet_pages
-    FakeHome.new(log: test_log).run do |home|
-      FakeNode.new(log: test_log).run(opts) do |port|
-        wallet = home.create_wallet(txns: 2)
-        base = "http://localhost:#{port}"
-        response = Zold::Http.new(uri: "#{base}/wallet/#{wallet.id}").put(wallet.path)
-        assert_equal(200, response.status, response.body)
-        assert_equal_wait(200) { Zold::Http.new(uri: "#{base}/wallet/#{wallet.id}").get.status }
-        [
-          '.txt', '.html',
-          '/balance', '/key', '/mtime',
-          '/digest', '/size',
-          '/age', '/mnemo', '/debt', '/txns',
-          '/txns.json', '.bin', '/copies'
-        ].each do |u|
-          assert_equal_wait(200) { Zold::Http.new(uri: "#{base}/wallet/#{wallet.id}#{u}").get.status }
+  [
+    '.txt', '.html',
+    '/balance', '/key', '/mtime',
+    '/digest', '/size',
+    '/age', '/mnemo', '/debt', '/txns',
+    '/txns.json', '.bin', '/copies'
+  ].each do |p|
+    method = "test_wallet_page_#{p.gsub(/[^a-z]/, '_')}"
+    define_method(method) do
+      FakeHome.new(log: test_log).run do |home|
+        FakeNode.new(log: test_log).run(opts) do |port|
+          wallet = home.create_wallet(txns: 2)
+          base = "http://localhost:#{port}"
+          response = Zold::Http.new(uri: "#{base}/wallet/#{wallet.id}").put(wallet.path)
+          assert_equal(200, response.status, response.body)
+          assert_equal_wait(200) { Zold::Http.new(uri: "#{base}/wallet/#{wallet.id}").get.status }
+          assert_equal_wait(200) { Zold::Http.new(uri: "#{base}/wallet/#{wallet.id}#{p}").get.status }
         end
       end
     end

data/views/journal.haml

@@ -0,0 +1,19 @@
+- if id
+  %p
+    Showing only wallet
+    %code= id
+
+%table
+  %thead
+    %tr
+      %th File
+      %th Size
+      %th Modified
+  %tbody
+    - files.each do |f|
+      - file = File.join(dir, f)
+      %tr
+        %td
+          %a{href: '/journal/item?id=#{f}'}= f
+        %td.right= Zold::Size.new(File.size(file))
+        %td= "#{Zold::Age.new(File.mtime(file))} ago"

data/views/layout.haml

@@ -0,0 +1,32 @@
+!!! 5
+%html
+  %head
+    %title= title
+    %meta{charset:'UTF-8'}
+    %meta{name: 'viewport', content: 'width=device-width, initial-scale=1.0'}
+    %meta{name: 'keywords', content: 'Zold, Cryptocurrency, Payments, Online Payments'}
+    %meta{name: 'description', content: description}
+    %link{rel: 'shortcut icon', href: '//www.zold.io/images/logo.png'}
+    %link{href: '//cdn.jsdelivr.net/gh/yegor256/tacit@gh-pages/tacit-css-1.4.2.min.css', rel: 'stylesheet'}
+    %link{href: '//www.zold.io/0.13.3/css/main.min.css', rel: 'stylesheet'}
+    %meta{name: 'twitter:creator', content: '@0crat'}
+    %meta{name: 'twitter:site', content: '@0crat'}
+    %meta{name: 'twitter:title', property: 'og:title', content: 'Zold'}
+    %meta{name: 'twitter:description', property: 'og:description', content: 'Experimental Non-Blockchain Cryptocurrency for Fast Micropayments'}
+    %meta{name: 'twitter:url', property: 'og:url', content: request.url}
+    %meta{name: 'telegram:channel', content: 'zold_io'}
+    %meta{name: 'og:image', content: '//blog.zold.io/images/ledger.jpg'}
+    %meta{name: 'twitter:image', content: '//blog.zold.io/images/ledger.jpg'}
+    %meta{name: 'twitter:card', content: 'summary'}
+    %meta{name: 'twitter:image:alt', content: 'Zold'}
+  %body
+    %section
+      %p
+        %a{href: '/'}
+          %img.logo{src: '//www.zold.io/images/logo.svg', alt: 'Zold logo'}
+      = yield
+      %p.footnotes
+        = Zold::VERSION
+      %p
+        %a{href: 'https://github.com/zold-io/zold/stargazers'}
+          %img{src: '//img.shields.io/github/stars/zold-io/zold.svg?style=flat-square', alt: 'GitHub stars'}

data/views/wallet.haml

@@ -0,0 +1,56 @@
+%p
+  = wallet.network
+  %br
+  = wallet.protocol.to_s
+  %br
+  %code= wallet.id.to_s
+  %br
+  = wallet.key.to_pub.gsub(/([^ ]{16})/, '\1­')
+
+%table
+  %thead
+    %th
+      %th Id
+      %th Date
+      %th Amount
+      %th Wallet
+      %th Details
+  %tbody
+    - wallet.txns.each do |t|
+      %tr
+        - color = t.amount.negative? ? 'red' : 'green'
+        %td{style: "color:#{color};"}= t.id
+        %td= t.date.utc.iso8601
+        %td{style:"text-align:right;color:#{color};"}= t.amount.to_zld(2)
+        %td
+          %a{href: "/wallet/#{t.bnf}.html"}
+            %code= t.bnf
+        %td= CGI.escapeHTML(t.details).gsub(/([^ ]{16})/, '\1­')
+
+%p
+  = '—'
+  %br
+  Balance:
+  = wallet.balance.to_zld(8)
+  ZLD
+  = "(#{wallet.balance.to_i} zents)"
+  %br
+  Transactions:
+  = wallet.txns.count
+  %br
+  Taxes:
+  = Zold::Tax.new(wallet).paid
+  paid, the debt is
+  = Zold::Tax.new(wallet).debt
+  %br
+  File size:
+  = "#{Zold::Size.new(wallet.size)}/#{wallet.size}"
+  = Zold::Copies.new(File.join(settings.copies, wallet.id)).all.count
+  copies
+  %br
+  Modified:
+  = wallet.mtime.utc.iso8601
+  = "(#{Zold::Age.new(wallet.mtime.utc.iso8601)} ago)"
+  %br
+  Digest:
+  %code= wallet.digest

data/zold.gemspec

@@ -66,6 +66,7 @@ and suggests a different architecture for digital wallet maintenance.'
   s.add_runtime_dependency 'diffy', '3.2.1'
   s.add_runtime_dependency 'futex', '>=0.8.5'
   s.add_runtime_dependency 'get_process_mem', '~>0.2'
+  s.add_runtime_dependency 'haml', '5.0.4'
   s.add_runtime_dependency 'json', '2.1.0'
   s.add_runtime_dependency 'memory_profiler', '0.9.12'
   s.add_runtime_dependency 'mimic', '0.4.2'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.26.17
+  version: 0.26.18
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-15 00:00:00.000000000 Z
+date: 2019-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: haml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 5.0.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 5.0.4
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -775,13 +789,16 @@ files:
 - upgrades/move_wallets_into_tree.rb
 - upgrades/protocol_up.rb
 - upgrades/rename_foreign_wallets.rb
+- views/journal.haml
+- views/layout.haml
+- views/wallet.haml
 - zold.gemspec
 homepage: http://github.com/zold-io/zold
 licenses:
 - MIT
 metadata: {}
 post_install_message: |-
-  Thanks for installing Zold 0.26.17!
+  Thanks for installing Zold 0.26.18!
     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