zold 0.14.26 → 0.14.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4395e269936df99f2f80289e47287be347e2f3a
-  data.tar.gz: 5719f9f81b7c4c70860c67a1903cfc01b5dbe95c
+  metadata.gz: ff2a076e21158840c47f865ccaf53b4c590f7920
+  data.tar.gz: 800ce350438a7f9424de3b85c75f04ac17866efd
 SHA512:
-  metadata.gz: b8849738bb1417903741cb729467ae2f96e1a244578a8702a0e4b0d69f674ba710587c17bed2ff023b639aed6d0825748f4e970f371dd7360a3d3692ab6a9898
-  data.tar.gz: 4d84feac840f4e4992025e8938ce24a62ec3d56d14b5393460984e8d8de907d8295f1b07b6f485b19f2e03342ff113d9dbeb4ceed5c0159229a4c0357dfe5f42
+  metadata.gz: 58adc79b2927b63f4168112709f80469fbea9153656e181d8604c42e2e37ad44d017a4251fe5d60b3c5449b0d23e5173bdd89fb87527ce000d8203b6e29d5e14
+  data.tar.gz: 2d1bb0ee453fbeaba2829ab37b233e67127c3819347052778d6a0c853608aada5d9bfcfd9e5700611efef4bafc987c6ab88f78e6945d6da6e8715401a021067c

data/appveyor.yml

@@ -13,7 +13,18 @@ environment:
     - RUBY_VERSION: 24
     - RUBY_VERSION: 25
 install:
-  - cmd: set PATH=C:\Ruby%RUBY_VERSION%-X64\bin;%PATH%
+  - ps: |
+      $Env:PATH = "C:\Ruby${Env:ruby_version}-X64\bin;${Env:PATH}"
+      if ($Env:ruby_version -match "^23" ) {
+        # RubyInstaller; download OpenSSL headers from OpenKnapsack Project
+        $Env:openssl_dir = "C:\Ruby${Env:ruby_version}"
+        appveyor DownloadFile http://dl.bintray.com/oneclick/OpenKnapsack/x64/openssl-1.0.2j-x64-windows.tar.lzma
+        7z e openssl-1.0.2j-x64-windows.tar.lzma
+        7z x -y -oC:\Ruby${Env:ruby_version} openssl-1.0.2j-x64-windows.tar
+      } else {
+        # RubyInstaller2; openssl package seems to be installed already
+        $Env:openssl_dir = "C:\msys64\mingw64"
+      }
   - cmd: ruby --version
   - cmd: git --version
   - cmd: bundle config --local path vendor/bundle

data/lib/zold/age.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2018 Yegor Bugayenko
+#
+# 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 'time'
+
+# Age
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2018 Yegor Bugayenko
+# License:: MIT
+module Zold
+  # Age
+  class Age
+    def initialize(time)
+      @time = time
+      @time = Time.parse(@time) unless time.is_a?(Time)
+    end
+
+    def to_s
+      return '?' if @time.nil?
+      sec = Time.now - @time
+      if sec < 60
+        "#{sec.round(2)}s"
+      elsif sec < 60 * 60
+        "#{(sec / 60).round}m"
+      else
+        "#{(sec / 3600).round}h"
+      end
+    end
+  end
+end

data/lib/zold/commands/clean.rb

@@ -26,6 +26,7 @@ require 'time'
 require 'slop'
 require 'rainbow'
 require_relative 'args'
+require_relative '../age'
 require_relative '../log'
 require_relative '../http'
 require_relative '../score'
@@ -63,7 +64,7 @@ Available options:"
       cps.all.each do |c|
         wallet = Wallet.new(c[:path])
         @log.debug("  #{c[:name]}: #{c[:score]} #{wallet.balance}/#{wallet.txns.count}t/\
-#{wallet.digest[0, 6]}/#{File.size(c[:path])}b")
+#{wallet.digest[0, 6]}/#{File.size(c[:path])}b/#{Age.new(File.mtime(c[:path]))}")
       end
     end
   end

data/lib/zold/commands/fetch.rb

@@ -26,8 +26,10 @@ require 'time'
 require 'tempfile'
 require 'slop'
 require 'rainbow'
+require 'concurrent/atomics'
 require_relative 'args'
 require_relative '../log'
+require_relative '../age'
 require_relative '../http'
 require_relative '../score'
 require_relative '../json_page'
@@ -75,18 +77,24 @@ Available options:"
     private
 
     def fetch(id, cps, opts)
-      total = 0
-      nodes = 0
-      done = 0
+      total = Concurrent::AtomicFixnum.new
+      nodes = Concurrent::AtomicFixnum.new
+      done = Concurrent::AtomicFixnum.new
       @remotes.iterate(@log) do |r|
-        nodes += 1
-        total += fetch_one(id, r, cps, opts)
-        done += 1
+        nodes.increment
+        total.increment(fetch_one(id, r, cps, opts))
+        done.increment
+      end
+      raise "There are no remote nodes, run 'zold remote reset'" if nodes.value.zero?
+      raise "No nodes out of #{nodes.value} have the wallet #{id}" if done.value.zero? && !opts['quiet-if-absent']
+      @log.info("#{done.value} copies of #{id} fetched with the total score of \
+#{total.value} from #{nodes.value} nodes")
+      @log.debug("#{cps.all.count} local copies:")
+      cps.all.each do |c|
+        wallet = Wallet.new(c[:path])
+        @log.debug("  #{c[:name]}: #{c[:score]} #{wallet.balance}/#{wallet.txns.count}t/\
+#{wallet.digest[0, 6]}/#{File.size(c[:path])}b/#{Age.new(File.mtime(c[:path]))}")
       end
-      raise "There are no remote nodes, run 'zold remote reset'" if nodes.zero?
-      raise "No nodes out of #{nodes} have the wallet #{id}" if done.zero? && !opts['quiet-if-absent']
-      @log.info("#{done} copies of #{id} fetched for the total score of #{total} from #{nodes} nodes")
-      @log.debug("#{cps.all.count} local copies:\n  #{cps.all.map { |c| "#{c[:name]}: #{c[:score]}" }.join("\n  ")}")
     end
 
     def fetch_one(id, r, cps, opts)
@@ -118,7 +126,8 @@ Available options:"
           raise "The balance of #{id} is #{wallet.balance} and it's not a root wallet"
         end
         copy = cps.add(File.read(f), score.host, score.port, score.value)
-        @log.info("#{r} returned #{body.length}b/#{wallet.balance}/#{wallet.txns.count}t/#{digest(json)}/#{age(json)} \
+        @log.info("#{r} returned #{body.length}b/#{wallet.balance}/#{wallet.txns.count}t/\
+#{digest(json)}/#{Age.new(json['mtime'])} \
 as copy #{copy} of #{id} in #{(Time.now - start).round(2)}s: #{Rainbow(score.value).green} (#{json['version']})")
       end
       score.value
@@ -129,18 +138,5 @@ as copy #{copy} of #{id} in #{(Time.now - start).round(2)}s: #{Rainbow(score.val
       return '?' if hash.nil?
       hash[0, 6]
     end
-
-    def age(json)
-      mtime = json['mtime']
-      return '?' if mtime.nil?
-      sec = Time.now - Time.parse(mtime)
-      if sec < 60
-        "#{sec.round(2)}s"
-      elsif sec < 60 * 60
-        "#{(sec / 60).round}m"
-      else
-        "#{(sec / 3600).round}h"
-      end
-    end
   end
 end

data/lib/zold/commands/merge.rb

@@ -84,10 +84,10 @@ Available options:"
       end
       modified = patch.save(wallet.path, overwrite: true)
       if modified
-        @log.debug("#{cps.count} copies with the total score of #{score} successfully merged \
+        @log.info("#{cps.count} copies with the total score of #{score} successfully merged \
 into #{wallet.id}/#{wallet.balance}/#{wallet.txns.count}t")
       else
-        @log.debug("Nothing changed in #{wallet.id} after merge of #{cps.count} copies")
+        @log.info("Nothing changed in #{wallet.id} after merge of #{cps.count} copies")
       end
       modified
     end

data/lib/zold/commands/node.rb

@@ -123,6 +123,9 @@ module Zold
           'Don\'t run the metronome',
           required: true,
           default: false
+        o.string '--alias',
+          'The alias of the node (default: host:port)',
+          require: false
         o.bool '--help', 'Print instructions'
       end
       if opts.help?
@@ -171,6 +174,12 @@ module Zold
       Front.set(:dump_errors, opts['dump-errors'])
       Front.set(:port, opts['bind-port'])
       Front.set(:reboot, !opts['never-reboot'])
+      node_alias = opts[:alias] || address
+      unless node_alias.eql?(address)
+        re = Regexp.new(/^[a-z0-9]{4,16}$/)
+        raise '--alias should be a 4 to 16 char long alphanumeric string' unless re.match(node_alias)
+      end
+      Front.set(:node_alias, node_alias)
       invoice = opts[:invoice]
       unless invoice.include?('@')
         if @wallets.find(Id.new(invoice)).exists?

data/lib/zold/id.rb

@@ -48,11 +48,16 @@ module Zold
       to_s.hash
     end
 
-    def==(other)
+    def ==(other)
       raise 'Can only compare with Id' unless other.is_a?(Id)
       to_s == other.to_s
     end
 
+    def <=>(other)
+      raise 'Can only compare with Id' unless other.is_a?(Id)
+      to_s <=> other.to_s
+    end
+
     def to_str
       to_s
     end

data/lib/zold/node/front.rb

@@ -67,6 +67,7 @@ module Zold
       set :wallets, nil? # to be injected at node.rb
       set :remotes, nil? # to be injected at node.rb
       set :copies, nil? # to be injected at node.rb
+      set :node_alias, nil? # to be injected at node.rb
     end
     use Rack::Deflater
 
@@ -150,6 +151,7 @@ while #{settings.address} is in '#{settings.network}'"
       content_type 'application/json'
       JSON.pretty_generate(
         version: settings.version,
+        alias: settings.node_alias,
         network: settings.network,
         protocol: settings.protocol,
         score: score.to_h,
@@ -177,11 +179,13 @@ while #{settings.address} is in '#{settings.network}'"
       content_type 'application/json'
       {
         version: settings.version,
+        alias: settings.node_alias,
         protocol: settings.protocol,
         id: wallet.id.to_s,
         score: score.to_h,
         wallets: settings.wallets.all.count,
         mtime: wallet.mtime.utc.iso8601,
+        size: File.size(wallet.path),
         digest: wallet.digest,
         balance: wallet.balance.to_i,
         body: AtomicFile.new(wallet.path).read
@@ -195,6 +199,7 @@ while #{settings.address} is in '#{settings.network}'"
       content_type 'application/json'
       {
         version: settings.version,
+        alias: settings.node_alias,
         protocol: settings.protocol,
         id: wallet.id.to_s,
         score: score.to_h,
@@ -255,11 +260,20 @@ while #{settings.address} is in '#{settings.network}'"
         '--',
         "Balance: #{wallet.balance.to_zld}",
         "Transactions: #{wallet.txns.count}",
+        "Wallet size: #{File.size(wallet.path)} bytes",
         "Modified: #{wallet.mtime.utc.iso8601}",
         "Digest: #{wallet.digest}"
       ].join("\n")
     end
 
+    get %r{/wallet/(?<id>[A-Fa-f0-9]{16})\.bin} do
+      id = Id.new(params[:id])
+      wallet = settings.wallets.find(id)
+      error 404 unless wallet.exists?
+      content_type 'text/plain'
+      AtomicFile.new(wallet.path).read
+    end
+
     put %r{/wallet/(?<id>[A-Fa-f0-9]{16})/?} do
       request.body.rewind
       modified = settings.entrance.push(Id.new(params[:id]), request.body.read.to_s)
@@ -269,6 +283,7 @@ while #{settings.address} is in '#{settings.network}'"
       end
       JSON.pretty_generate(
         version: settings.version,
+        alias: settings.node_alias,
         score: score.to_h,
         wallets: settings.wallets.all.count
       )
@@ -278,6 +293,7 @@ while #{settings.address} is in '#{settings.network}'"
       content_type 'application/json'
       JSON.pretty_generate(
         version: settings.version,
+        alias: settings.node_alias,
         score: score.to_h,
         all: settings.remotes.all
       )

data/lib/zold/patch.rb

@@ -125,6 +125,7 @@ among #{payer.txns.count} transactions: #{txn.to_text}")
       wallet = Wallet.new(file)
       wallet.init(@id, @key, overwrite: overwrite, network: @network)
       @txns.each { |t| wallet.add(t) }
+      wallet.refurbish
       after = AtomicFile.new(file).read
       before != after
     end

data/lib/zold/txn.rb

@@ -75,6 +75,11 @@ module Zold
         details == other.details && sign == other.sign
     end
 
+    def <=>(other)
+      raise 'Can only compare with Txn' unless other.is_a?(Txn)
+      [date, amount * -1, id, bnf] <=> [other.date, other.amount * -1, other.id, other.bnf]
+    end
+
     def to_s
       [
         Hexnum.new(@id, 4).to_s,
@@ -101,6 +106,9 @@ module Zold
       t
     end
 
+    # Sign the transaction and add RSA signature to it
+    # +pvt+:: The private RSA key of the paying wallet
+    # +id+:: Paying wallet ID
     def signed(pvt, id)
       t = clone
       t.sign = Signature.new.sign(pvt, id, self)

data/lib/zold/version.rb

@@ -25,6 +25,6 @@
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 module Zold
-  VERSION = '0.14.26'
+  VERSION = '0.14.27'
   PROTOCOL = 2
 end

data/lib/zold/wallet.rb

@@ -28,6 +28,7 @@ require_relative 'id'
 require_relative 'txn'
 require_relative 'tax'
 require_relative 'amount'
+require_relative 'hexnum'
 require_relative 'signature'
 require_relative 'atomic_file'
 
@@ -168,7 +169,7 @@ module Zold
       lines.drop(5)
         .each_with_index
         .map { |line, i| Txn.parse(line, i + 6) }
-        .sort_by { |t| [t.date, t.amount * -1] }
+        .sort
     end
 
     def refurbish

data/test/node/test_front.rb

@@ -23,6 +23,7 @@
 require 'minitest/autorun'
 require 'json'
 require 'time'
+require 'securerandom'
 require_relative '../test__helper'
 require_relative 'fake_node'
 require_relative '../fake_home'
@@ -217,4 +218,44 @@ class FrontTest < Minitest::Test
       end
     end
   end
+
+  def test_alias_parameter
+    name = SecureRandom.hex(4)
+    FakeNode.new(log: test_log).run(['--ignore-score-weakness', "--alias=#{name}"]) do |port|
+      [
+        '/',
+        '/remotes'
+      ].each do |path|
+        uri = URI("http://localhost:#{port}#{path}")
+        response = Zold::Http.new(uri: uri, score: nil).get
+        assert_match(
+          name,
+          Zold::JsonPage.new(response.body).to_hash['alias'].to_s,
+          response.body
+        )
+      end
+    end
+  end
+
+  def test_default_alias_parameter
+    FakeNode.new(log: test_log).run(['--ignore-score-weakness']) do |port|
+      uri = URI("http://localhost:#{port}/")
+      response = Zold::Http.new(uri: uri, score: nil).get
+      assert_match(
+        "localhost:#{port}",
+        Zold::JsonPage.new(response.body).to_hash['alias'].to_s,
+        response.body
+      )
+    end
+  end
+
+  def test_invalid_alias
+    exception = assert_raises RuntimeError do
+      FakeNode.new(log: test_log).run(['--ignore-score-weakness', '--alias=invalid-alias']) do |port|
+        uri = URI("http://localhost:#{port}/")
+        Zold::Http.new(uri: uri, score: nil).get
+      end
+    end
+    assert_equal('--alias should be a 4 to 16 char long alphanumeric string', exception.message)
+  end
 end

data/test/test_patch.rb

@@ -106,4 +106,38 @@ class TestPatch < Minitest::Test
       assert_equal(Zold::Amount.new(zld: 2.0), first.balance)
     end
   end
+
+  def test_merges_fragmented_parts
+    FakeHome.new.run do |home|
+      first = home.create_wallet(Zold::Id::ROOT)
+      second = home.create_wallet
+      File.write(second.path, File.read(first.path))
+      key = Zold::Key.new(file: 'fixtures/id_rsa')
+      start = Time.parse('2017-07-19T21:24:51Z')
+      first.add(
+        Zold::Txn.new(
+          1, start, Zold::Amount.new(zld: -2.0),
+          'NOPREFIX', Zold::Id.new, 'first payment'
+        ).signed(key, first.id)
+      )
+      second.add(
+        Zold::Txn.new(
+          2, start + 1, Zold::Amount.new(zld: -2.0),
+          'NOPREFIX', Zold::Id.new, 'second payment'
+        ).signed(key, first.id)
+      )
+      first.add(
+        Zold::Txn.new(
+          3, start + 2, Zold::Amount.new(zld: -2.0),
+          'NOPREFIX', Zold::Id.new, 'third payment'
+        ).signed(key, first.id)
+      )
+      patch = Zold::Patch.new(home.wallets, log: test_log)
+      patch.join(first)
+      patch.join(second)
+      FileUtils.rm(first.path)
+      assert_equal(true, patch.save(first.path))
+      assert_equal(Zold::Amount.new(zld: -6.0), first.balance)
+    end
+  end
 end

data/test/test_wallet.rb

@@ -34,6 +34,14 @@ require_relative '../lib/zold/commands/pay'
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 class TestWallet < Minitest::Test
+  def test_reads_empty_wallet
+    FakeHome.new.run do |home|
+      wallet = home.create_wallet
+      assert(wallet.txns.empty?)
+      assert_equal(Zold::Amount::ZERO, wallet.balance)
+    end
+  end
+
   def test_adds_transaction
     FakeHome.new.run do |home|
       wallet = home.create_wallet
@@ -171,4 +179,33 @@ class TestWallet < Minitest::Test
       )
     end
   end
+
+  def test_sorts_them_always_right
+    FakeHome.new.run do |home|
+      time = Time.now
+      txns = []
+      50.times do
+        txns << Zold::Txn.new(
+          1,
+          time,
+          Zold::Amount.new(zld: 1.99),
+          'NOPREFIX', Zold::Id.new, '-'
+        )
+      end
+      wallet = home.create_wallet
+      empty = File.read(wallet.path)
+      text = ''
+      10.times do
+        File.write(wallet.path, empty)
+        txns.shuffle!
+        txns.each { |t| wallet.add(t) }
+        wallet.refurbish
+        if text.empty?
+          text = File.read(wallet.path)
+          next
+        end
+        assert_equal(text, File.read(wallet.path))
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.14.26
+  version: 0.14.27
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-01 00:00:00.000000000 Z
+date: 2018-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -400,6 +400,7 @@ files:
 - fixtures/scripts/spread-wallets.sh
 - heroku-run.sh
 - lib/zold.rb
+- lib/zold/age.rb
 - lib/zold/amount.rb
 - lib/zold/atomic_file.rb
 - lib/zold/backtrace.rb