zold 0.26.18 → 0.26.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89109464b2af91b04867b407d157ad720d3f427f448c219d35fb582a50b11d26
-  data.tar.gz: 8b5ec196c38cb866499d6b8668f78103d2d420195269a6420d8ef1fa91677d69
+  metadata.gz: 6fa341a547ba1c83699a076f78886ea6cd3f28c2dca5b46675e214f4ee155fc3
+  data.tar.gz: 4570c47941b0522ceebb915620c016c7aa239984d1510f2219631a35d76a655b
 SHA512:
-  metadata.gz: 9af8dd404a6cde1f6bba43b3de2df8ad9716c4b7fba0d06adbf020a89f032a624686b6aacaf899bfbf740ed163da8ff1fb17193167e834ea2643ee9377398c3a
-  data.tar.gz: 2cd5d57d28b64bd71bcfd8fc81e8201a5a749d2b8b50f2c1af45a99f62b2d52f0236a16fdf38ed7dde06443fa42501eee004e93fc921e1ba6bbad3c1ceef314d
+  metadata.gz: d818d6a9e3bbcc5ad446de965d70ffe72ecd9f78d9c04e49fe0d547a2be9c148cff3e5c9381ba37888bc6562e43e95b7c928b997622ace8a1dbaad9876438715
+  data.tar.gz: 792d5b93d848ee5d8685a9f4242c99b5753abb21c5071684a98069ca5570adf61470ef9117fdb3a37f7df335b9d2ee9222821430043ac2490cd1733bbe262b56

data/lib/zold/commands/merge.rb

@@ -74,6 +74,9 @@ Available options:"
         o.string '--ledger',
           'The name of the file where all new negative transactions will be recorded (default: /dev/null)',
           default: '/dev/null'
+        o.array '--trusted',
+          'List of wallet IDs we fully trust and won\'t pull',
+          default: []
         o.string '--network',
           'The name of the network we work in',
           default: 'test'
@@ -151,10 +154,13 @@ into #{@wallets.acq(id, &:mnemo)} in #{Age.new(start, limit: 0.1 + cps.count * 0
         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']}", '--quiet-if-absent'] +
-            (opts['deep'] ? ['--deep'] : ['--shallow'])
-          )
+          unless opts['trusted'].include?(txn.bnf.to_s) || opts['trusted'].count > 32
+            Pull.new(wallets: @wallets, remotes: @remotes, copies: @copies, log: @log).run(
+              ['pull', txn.bnf.to_s, "--network=#{opts['network']}", '--quiet-if-absent'] +
+              (opts['deep'] ? ['--deep'] : ['--shallow']) +
+              ['--trusted=' + (opts['trusted'] + [txn.bnf.to_s]).join(',')]
+            )
+          end
           true
         end
       end

data/lib/zold/node/front.rb

@@ -479,7 +479,9 @@ this is not a normal behavior, you may want to report a bug to our GitHub reposi
 
     get '/journal/item' do
       content_type('text/plain')
-      IO.read(File.join(settings.journal_dir, params[:id]))
+      file = File.join(settings.journal_dir, params[:id])
+      error(404, "Journal item not found at #{file}") unless File.exist?(file)
+      IO.read(file)
     end
 
     not_found do

data/lib/zold/node/journaled_pipeline.rb

@@ -84,6 +84,8 @@ module Zold
       jlog.level = Logger::DEBUG
       jlog.formatter = Log::COMPACT
       jlog.info("push(#{id}, #{body.length} bytes): starting...")
+      jlog.info("Time: #{Time.now.utc.iso8601}")
+      jlog.info("Zold gem version: #{Zold::VERSION}")
       modified = @pipeline.push(id, body, JournaledPipeline::Wallets.new(wallets, jlog), Log::Tee.new(log, jlog))
       jlog.info("push(#{id}): done")
       modified

data/lib/zold/version.rb

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

data/test/node/fake_node.rb

@@ -80,7 +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
+          sleep 0.1 # stupid sleep to make sure all threads are terminated
         end
       end
     end

data/views/journal.haml

@@ -3,6 +3,10 @@
     Showing only wallet
     %code= id
 
+%p
+  = files.count
+  PUSH operation(s) over the last 24 hours:
+
 %table
   %thead
     %tr
@@ -14,6 +18,7 @@
       - file = File.join(dir, f)
       %tr
         %td
-          %a{href: '/journal/item?id=#{f}'}= f
+          %a{href: "/journal/item?id=#{f}"}<
+            %code= f
         %td.right= Zold::Size.new(File.size(file))
         %td= "#{Zold::Age.new(File.mtime(file))} ago"

data/views/layout.haml

@@ -21,12 +21,34 @@
     %meta{name: 'twitter:image:alt', content: 'Zold'}
   %body
     %section
-      %p
-        %a{href: '/'}
-          %img.logo{src: '//www.zold.io/images/logo.svg', alt: 'Zold logo'}
+      %header
+        %nav
+          %li
+            %a{href: '/'}
+              %img.logo{src: '//www.zold.io/images/logo.svg', alt: 'Zold logo'}
+        %nav
+          %li
+            %a{href: '/'} Home
+          %li
+            %a{href: '/queue'} Queue
+          %li
+            %a{href: '/remotes'} Remotes
+          %li
+            %a{href: '/threads'} Threads
+          %li
+            %a{href: '/wallets'} Wallets
+          %li
+            %a{href: '/ledger'} Ledger
+          %li
+            %a{href: '/journal'} Journal
+          %li
+            %a{href: '/farm'} Farm
+          %li
+            %a{href: '/metronome'} Metronome
       = 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'}
+      %footer
+        %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

@@ -9,7 +9,7 @@
 
 %table
   %thead
-    %th
+    %tr
       %th Id
       %th Date
       %th Amount

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.26.18
+  version: 0.26.19
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -798,7 +798,7 @@ licenses:
 - MIT
 metadata: {}
 post_install_message: |-
-  Thanks for installing Zold 0.26.18!
+  Thanks for installing Zold 0.26.19!
     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