zold 0.13.32 → 0.13.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efe52b4e0be9a85e1a66d18a637d4495c6fd7409
-  data.tar.gz: e698b73bda8784b6eb40d3ca9d50b175050938da
+  metadata.gz: a7fc6c26e23e3a3d056b786a847f4ea01b4f8763
+  data.tar.gz: f43869756f2b8eb4a7d63e22c6392ee297483246
 SHA512:
-  metadata.gz: a1d4c2a547c39e6647cc44021edc81ade879816a09768f730823b143a287dec9b5fe69c6cdc34567d2afe8daa34975f0194d7511cde5ffb6b3f630d5071aa110
-  data.tar.gz: e87c42f314772d1b789cedfc629e0551a41c7e980a8804c9403c9e37256870f8b73fc347845edd184af80e59379fcfd01a5378d94d36ca2e14b173d79add425f
+  metadata.gz: 896be48716e75a94ff60de18c026ca36eeba4a558d2fbad47a7aa934dab4543724d23df676e778a20f28c19a2aa93a8504a1a099832f04013626adc4f3568534
+  data.tar.gz: 34aed103cece3a518ea2d9d17a8f5c03e2ee7ba495341a0e8a50ae85c32115a3717811eba5118661d6e35424032736f7a0f26f37e7fdd2f25a80fe93a28332a3

data/heroku-run.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-./bin/zold node --no-colors --trace --verbose \
+./bin/zold node --no-colors --trace \
     --bind-port=$PORT --port=80 --host=b1.zold.io --threads=0 \
     --invoice=ML5Ern7m@912ecc24b32dbe74 --never-reboot \
     --bonus-wallet=81c9c25789b03876 --private-key=bonus.key --bonus-amount=1 --bonus-time=60

data/lib/zold/commands/diff.rb

@@ -65,7 +65,7 @@ Available options:"
     def diff(wallet, cps, _)
       raise "There are no remote copies, try 'zold fetch' first" if cps.all.empty?
       cps = cps.all.sort_by { |c| c[:score] }.reverse
-      patch = Patch.new(log: @log)
+      patch = Patch.new(@wallets, log: @log)
       cps.each do |c|
         patch.join(Wallet.new(c[:path]))
       end

data/lib/zold/commands/merge.rb

@@ -45,6 +45,9 @@ module Zold
       opts = Slop.parse(args, help: true, suppress_errors: true) do |o|
         o.banner = "Usage: zold merge [ID...] [options]
 Available options:"
+        o.bool '--no-baseline',
+          'Don\'t trust any remote copies and re-validate all incoming payments against their wallets',
+          default: false
         o.bool '--help', 'Print instructions'
       end
       mine = Args.new(opts, @log).take || return
@@ -61,20 +64,20 @@ Available options:"
 
     private
 
-    def merge(id, cps, _)
+    def merge(id, cps, opts)
       if cps.all.empty?
         @log.error("There are no remote copies of #{id}, try 'zold fetch' first")
         return
       end
       cps = cps.all.sort_by { |c| c[:score] }.reverse
-      patch = Patch.new(log: @log)
+      patch = Patch.new(@wallets, log: @log)
       cps.each do |c|
-        merge_one(patch, Wallet.new(c[:path]), "#{c[:host]}:#{c[:port]}")
+        merge_one(opts, patch, Wallet.new(c[:path]), "#{c[:host]}:#{c[:port]}")
         @log.debug("#{c[:host]}:#{c[:port]} merged: #{patch}")
       end
       wallet = @wallets.find(id)
       if wallet.exists?
-        merge_one(patch, wallet, 'localhost')
+        merge_one(opts, patch, wallet, 'localhost')
         @log.debug("Local copy merged: #{patch}")
       else
         @log.debug("Local copy is absent, won't merge")
@@ -88,8 +91,8 @@ Available options:"
       modified
     end
 
-    def merge_one(patch, wallet, name)
-      patch.join(wallet)
+    def merge_one(opts, patch, wallet, name)
+      patch.join(wallet, !opts['no-baseline'])
     rescue StandardError => e
       @log.error("Can't merge a copy coming from #{name}: #{e.message}")
       @log.debug(Backtrace.new(e).to_s)

data/lib/zold/commands/node.rb

@@ -158,6 +158,7 @@ module Zold
       farm.start(host, opts[:port], threads: opts[:threads], strength: opts[:strength]) do
         Front.set(:farm, farm)
         metronome = metronome(farm, entrance, opts)
+        Front.set(:metronome, metronome)
         begin
           @log.info("Starting up the web front at http://#{host}:#{opts[:port]}...")
           Front.run!

data/lib/zold/metronome.rb

@@ -33,6 +33,12 @@ module Zold
       @threads = []
     end
 
+    def to_text
+      @threads.map do |t|
+        "#{t.name}: status=#{t.status}; alive=#{t.alive?};\n  #{t.backtrace.join("\n  ")}"
+      end.join("\n")
+    end
+
     def add(routine)
       @threads << Thread.start do
         Thread.current.name = routine.class.name

data/lib/zold/node/entrance.rb

@@ -131,7 +131,7 @@ and modified nothing (this is most likely a bug!)")
       ).run(['fetch', id.to_s, "--ignore-node=#{@address}"])
       modified = Merge.new(
         wallets: @wallets, copies: copies.root, log: @log
-      ).run(['merge', id.to_s])
+      ).run(['merge', id.to_s, '--no-baseline'])
       Clean.new(wallets: @wallets, copies: copies.root, log: @log).run(['clean', id.to_s])
       copies.remove(localhost, Remotes::PORT)
       spread(modified)

data/lib/zold/node/front.rb

@@ -56,6 +56,7 @@ module Zold
       set :log, nil? # to be injected at node.rb
       set :address, nil? # to be injected at node.rb
       set :farm, nil? # to be injected at node.rb
+      set :metronome, nil? # to be injected at node.rb
       set :entrance, nil? # to be injected at node.rb
       set :wallets, nil? # to be injected at node.rb
       set :remotes, nil? # to be injected at node.rb
@@ -201,6 +202,11 @@ module Zold
       settings.farm.to_text
     end
 
+    get '/metronome' do
+      content_type 'text/plain'
+      settings.metronome.to_text
+    end
+
     not_found do
       status 404
       content_type 'text/plain'

data/lib/zold/patch.rb

@@ -31,21 +31,29 @@ require_relative 'atomic_file'
 module Zold
   # A patch
   class Patch
-    def initialize(log: Log::Quiet.new)
+    def initialize(wallets, log: Log::Quiet.new)
+      raise 'Wallets can\'t be nil' if wallets.nil?
+      raise 'Wallets must be of type Wallets' unless wallets.is_a?(Wallets)
+      @wallets = wallets
+      @txns = []
       @log = log
     end
 
     def to_s
-      return 'empty' if @id.nil?
+      return 'empty' if @txns.empty?
       "#{@txns.count} txns"
     end
 
-    def join(wallet)
+    def join(wallet, baseline = true)
       if @id.nil?
         @id = wallet.id
         @key = wallet.key
-        @txns = wallet.txns
-        @log.debug("The baseline: #{@txns.count} transactions, the balance is #{wallet.balance}")
+        if baseline
+          @txns = wallet.txns
+          @log.debug("The baseline: #{@txns.count} transactions, the balance is #{wallet.balance}")
+        else
+          @log.debug("The baseline of #{@txns.count} transactions ignored")
+        end
         @network = wallet.network
       end
       if wallet.network != @network
@@ -53,17 +61,16 @@ module Zold
       end
       raise 'Public key mismatch' if wallet.key != @key
       raise "Wallet ID mismatch: #{@id} != #{wallet.id}" if wallet.id != @id
-      negative = @txns.select { |t| t.amount.negative? }
-      max = negative.empty? ? 0 : negative.max_by(&:id).id
+      max = @txns.select { |t| t.amount.negative? }.map(&:id).max.to_i
       wallet.txns.each do |txn|
         next if @txns.find { |t| t == txn }
         if txn.amount.negative?
           if txn.id <= max
-            @log.debug("Transaction ID is less than max #{max}: #{txn.to_text}")
+            @log.error("Transaction ID is less than max #{max}: #{txn.to_text}")
             next
           end
           if @txns.find { |t| t.id == txn.id }
-            @log.debug("Transaction ##{txn.id} already exists: #{txn.to_text}")
+            @log.error("Transaction ##{txn.id} already exists: #{txn.to_text}")
             next
           end
           if !@txns.empty? && @txns.map(&:amount).inject(&:+) < txn.amount
@@ -74,9 +81,20 @@ module Zold
             @log.error("Invalid RSA signature at transaction ##{txn.id} of #{wallet.id}: #{txn.to_text}")
             next
           end
-        elsif !txn.sign.nil? && !txn.sign.empty?
-          @log.error("RSA signature is redundant at ##{txn.id} of #{wallet.id}: #{txn.to_text}")
-          next
+        else
+          if !txn.sign.nil? && !txn.sign.empty?
+            @log.error("RSA signature is redundant at ##{txn.id} of #{wallet.id}: #{txn.to_text}")
+            next
+          end
+          payer = @wallets.find(txn.bnf)
+          unless payer.exists?
+            @log.error("Paying wallet #{wallet.id} is absent at ##{txn.id}: #{txn.to_text}")
+            next
+          end
+          unless payer.has?(txn.id, wallet.id)
+            @log.error("Paying wallet #{wallet.id} doesn't have transaction ##{txn.id}: #{txn.to_text}")
+            next
+          end
         end
         @log.debug("Merged on top: #{txn.to_text}")
         @txns << txn

data/lib/zold/txn.rb

@@ -32,6 +32,12 @@ require_relative 'signature'
 module Zold
   # A single transaction
   class Txn
+    # Regular expression for details
+    RE_DETAILS = '[a-zA-Z0-9 @\!\?\*_\-\.:,\']+'.freeze
+
+    # Regular expression for prefix
+    RE_PREFIX = '[a-zA-Z0-9]+'.freeze
+
     attr_reader :id, :date, :amount, :prefix, :bnf, :details, :sign
     attr_writer :sign, :amount, :bnf
     def initialize(id, date, amount, prefix, bnf, details)
@@ -52,12 +58,12 @@ module Zold
       raise 'Prefix can\'t be NIL' if prefix.nil?
       raise "Prefix is too short: \"#{prefix}\"" if prefix.length < 8
       raise "Prefix is too long: \"#{prefix}\"" if prefix.length > 32
-      raise "Prefix is wrong: \"#{prefix}\"" unless prefix =~ /^[a-zA-Z0-9]+$/
+      raise "Prefix is wrong: \"#{prefix}\" (#{Txn::RE_PREFIX})" unless prefix =~ Regexp.new("^#{Txn::RE_PREFIX}$")
       @prefix = prefix
       raise 'Details can\'t be NIL' if details.nil?
       raise 'Details can\'t be empty' if details.empty?
       raise "Details are too long: \"#{details}\"" if details.length > 512
-      raise "Details are wrong: \"#{details}\"" unless details =~ /^[a-zA-Z0-9 -\.,]+$/
+      raise "Wrong details \"#{details}\" (#{Txn::RE_DETAILS})" unless details =~ Regexp.new("^#{Txn::RE_DETAILS}$")
       @details = details
     end
 
@@ -103,14 +109,14 @@ module Zold
           '([0-9a-f]{4})',
           '([0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z)',
           '([0-9a-f]{16})',
-          '([A-Za-z0-9]{8,32})',
+          "(#{Txn::RE_PREFIX})",
           '([0-9a-f]{16})',
-          '([a-zA-Z0-9 -\.,]{1,512})',
+          "(#{Txn::RE_DETAILS})",
           '([A-Za-z0-9+/]+={0,3})?'
         ].join(';') + '$'
       )
       clean = line.strip
-      raise "Invalid line ##{idx}: #{line.inspect}" unless regex.match(clean)
+      raise "Invalid line ##{idx}: #{line.inspect} #{regex}" unless regex.match(clean)
       parts = clean.split(';')
       txn = Txn.new(
         Hexnum.parse(parts[0]).to_i,

data/lib/zold/version.rb

@@ -23,5 +23,5 @@
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 module Zold
-  VERSION = '0.13.32'.freeze
+  VERSION = '0.13.33'.freeze
 end

data/test/commands/test_merge.rb

@@ -106,4 +106,19 @@ class TestMerge < Minitest::Test
       assert(!wallet.balance.zero?)
     end
   end
+
+  def test_rejects_fake_positives_in_new_wallet
+    FakeHome.new.run do |home|
+      main = home.create_wallet
+      remote = home.create_wallet
+      File.write(remote.path, File.read(main.path))
+      remote.add(Zold::Txn.new(1, Time.now, Zold::Amount.new(zld: 11.0), 'NOPREFIX', Zold::Id.new, 'fake'))
+      copies = home.copies(main)
+      copies.add(File.read(remote.path), 'fake-host', 80, 0)
+      Zold::Merge.new(wallets: home.wallets, copies: copies.root, log: test_log).run(
+        ['merge', main.id.to_s, '--no-baseline']
+      )
+      assert_equal(Zold::Amount::ZERO, main.balance)
+    end
+  end
 end

data/test/node/test_front.rb

@@ -37,6 +37,7 @@ class FrontTest < Minitest::Test
           '/remotes',
           '/version',
           '/farm',
+          '/metronome',
           '/score'
         ],
         '404' => [

data/test/test_patch.rb

@@ -46,13 +46,28 @@ class TestPatch < Minitest::Test
       File.write(third.path, File.read(first.path))
       t = third.sub(Zold::Amount.new(zld: 10.0), "NOPREFIX@#{Zold::Id.new}", key)
       third.add(t.inverse(first.id))
-      patch = Zold::Patch.new(log: test_log)
+      patch = Zold::Patch.new(home.wallets, log: test_log)
       patch.join(first)
       patch.join(second)
       patch.join(third)
       FileUtils.rm(first.path)
       assert_equal(true, patch.save(first.path))
-      assert_equal(Zold::Amount.new(zld: -43.0), first.balance)
+      assert_equal(Zold::Amount.new(zld: -53.0), first.balance)
+    end
+  end
+
+  def test_rejects_fake_positives
+    FakeHome.new.run do |home|
+      first = home.create_wallet
+      second = home.create_wallet
+      File.write(second.path, File.read(first.path))
+      second.add(Zold::Txn.new(1, Time.now, Zold::Amount.new(zld: 11.0), 'NOPREFIX', Zold::Id.new, 'fake'))
+      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::ZERO, first.balance)
     end
   end
 end

data/test/test_txn.rb

@@ -43,4 +43,16 @@ class TestTxn < Minitest::Test
     assert_equal('-99.95', txn.amount.to_zld)
     assert_equal('NOPREFIX', txn.prefix)
   end
+
+  def test_accepts_text_as_details
+    details = 'How are you, dude?! I\'m @yegor256: *_hello_'
+    txn = Zold::Txn.parse(
+      Zold::Txn.new(
+        123, Time.now, Zold::Amount.new(zld: -99.95),
+        'NOPREFIX', Zold::Id.new,
+        details
+      ).to_s
+    )
+    assert_equal(details, txn.details)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.13.32
+  version: 0.13.33
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-18 00:00:00.000000000 Z
+date: 2018-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby